capturing {% set %} should give Twig_Markup

diff --git a/lib/Twig/Node/Set.php b/lib/Twig/Node/Set.php
index 04be00e..9dae2ea 100644 (file)
--- a/lib/Twig/Node/Set.php
+++ b/lib/Twig/Node/Set.php
@@ -52,7 +52,7 @@ class Twig_Node_Set extends Twig_Node
             $compiler->subcompile($this->getNode('names'), false);
 
             if ($this->getAttribute('capture')) {
-                $compiler->raw(" = ob_get_clean()");
+                $compiler->raw(" = new Twig_Markup(ob_get_clean())");
             }
         }
 

diff --git a/test/Twig/Tests/Fixtures/tags/set/capture.test b/test/Twig/Tests/Fixtures/tags/set/capture.test
index 4408ca8..f156a1a 100644 (file)
--- a/test/Twig/Tests/Fixtures/tags/set/capture.test
+++ b/test/Twig/Tests/Fixtures/tags/set/capture.test
@@ -1,10 +1,10 @@
 --TEST--
 "set" tag block capture
 --TEMPLATE--
-{% set foo %}foo{% endset %}
+{% set foo %}f<br />o<br />o{% endset %}
 
 {{ foo }}
 --DATA--
 return array()
 --EXPECT--
-foo
+f<br />o<br />o

diff --git a/test/Twig/Tests/Node/SetTest.php b/test/Twig/Tests/Node/SetTest.php
index 7883fba..6f61922 100644 (file)
--- a/test/Twig/Tests/Node/SetTest.php
+++ b/test/Twig/Tests/Node/SetTest.php
@@ -51,7 +51,7 @@ class Twig_Tests_Node_SetTest extends Twig_Tests_Node_TestCase
         $tests[] = array($node, <<<EOF
 ob_start();
 echo "foo";
-\$context['foo'] = ob_get_clean();
+\$context['foo'] = new Twig_Markup(ob_get_clean());
 EOF
         );