Change Template::Render to return the result, rather than print it.

diff --git a/testing/tests/views/template_test.php b/testing/tests/views/template_test.php
index 62e684693a5091ed7c72ab5fcae18cdb5748262e..dc1e7ce5d3fee971916c75f9806d510ad9c6d727 100644 (file)
--- a/testing/tests/views/template_test.php
+++ b/testing/tests/views/template_test.php
@@ -23,11 +23,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
 {
   private function _Render($template)
   {
-    ob_start();
-    $template->Render();
-    $data = ob_get_contents();
-    ob_end_clean();
-    return $data;
+    return $template->Render();
   }
 
   public function testRenderSimple()

diff --git a/views/template.php b/views/template.php
index ede5723de8007347d1322c8a3ebb5638a257a029..12b69efb5f6588d878dfbc874c22c78e0e5e3067 100644 (file)
--- a/views/template.php
+++ b/views/template.php
@@ -83,7 +83,12 @@ class Template
       extract($_vars);
       eval('?>' . $_template . '<' . '?');
     };
+
+    ob_start();
     $render();
+    $data = ob_get_contents();
+    ob_end_clean();
+    return $data;
   }
 
   /*! @brief Does any pre-processing on the template.