fixed escaping for filtered object attributes (closes twigphp#59)

fabpot · Jun 11, 2010 · f87df8a · f87df8a
1 parent 40b16ec
commit f87df8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/Twig/NodeVisitor/Escaper.php b/lib/Twig/NodeVisitor/Escaper.php
@@ -71,7 +71,7 @@ protected function escapeNode(Twig_NodeInterface $node, Twig_Environment $env, $
 
         if ($expression instanceof Twig_Node_Expression_Filter) {
             // don't escape if the primary node of the filter is not a variable
-            if (!$expression->node instanceof Twig_Node_Expression_Name) {
+            if (!$expression->node instanceof Twig_Node_Expression_GetAttr && !$expression->node instanceof Twig_Node_Expression_Name) {
                 return $node;
             }
 

diff --git a/test/fixtures/tags/autoescape/objects.test b/test/fixtures/tags/autoescape/objects.test
@@ -3,6 +3,7 @@
 --TEMPLATE--
 {% autoescape on %}
 {{ user.name }}
+{{ user.name|lower }}
 {% endautoescape %}
 --DATA--
 class UserForAutoEscapeTest
@@ -15,3 +16,4 @@ class UserForAutoEscapeTest
 return array('user' => new UserForAutoEscapeTest())
 --EXPECT--
 Fabien&lt;br /&gt;
+fabien&lt;br /&gt;