From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 11 Jun 2010 05:20:33 +0000 (+0200)
Subject: fixed escaping for filtered object attributes (closes #59)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=f87df8a2fb6912e316f4bceadd15af8c5c06e0bb;p=web%2Fkonrad%2Ftwig.git

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

diff --git a/lib/Twig/NodeVisitor/Escaper.php b/lib/Twig/NodeVisitor/Escaper.php
index 1ceb38b..269dc47 100644
--- a/lib/Twig/NodeVisitor/Escaper.php
+++ b/lib/Twig/NodeVisitor/Escaper.php
@@ -71,7 +71,7 @@ class Twig_NodeVisitor_Escaper implements Twig_NodeVisitorInterface
 
         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
index 533aa30..44f41e1 100644
--- 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;