From: Matthieu Robin <mrobin@tf1.fr>
Date: Fri, 1 Jul 2011 08:35:24 +0000 (+0200)
Subject: fix nested buffers issue #374
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=681d2b8b7f9cbdc1b98390364e6f2baa76d2ddd9;p=konrad%2Ftwig.git

fix nested buffers issue #374
---

diff --git a/lib/Twig/Template.php b/lib/Twig/Template.php
old mode 100644
new mode 100755
index aaef78a..a9580e1
--- a/lib/Twig/Template.php
+++ b/lib/Twig/Template.php
@@ -192,15 +192,12 @@ abstract class Twig_Template implements Twig_TemplateInterface
      */
     public function render(array $context)
     {
+        $level = ob_get_level();
         ob_start();
         try {
             $this->display($context);
         } catch (Exception $e) {
-            // the count variable avoids an infinite loop on
-            // some Windows configurations where ob_get_level()
-            // never reaches 0
-            $count = 100;
-            while (ob_get_level() && --$count) {
+            while (ob_get_level() > $level) {
                 ob_end_clean();
             }