Skip sometimes attribute escaping

goetas · Jul 31, 2014 · bd57514 · bd57514
1 parent 24e497a
commit bd57514
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Goetas/Twital/EventSubscriber/ContextAwareEscapingSubscriber.php b/src/Goetas/Twital/EventSubscriber/ContextAwareEscapingSubscriber.php
@@ -70,8 +70,8 @@ private function esapeUrls(\DOMDocument $doc, \DOMXPath $xp)
         $res = $this->xpathQuery($xp, "(//xh:*/@href|//xh:*/@src)[contains(., '{$this->options['tag_variable'][0]}') and contains(., '{$this->options['tag_variable'][1]}')]", $doc, false);
         foreach ($res as $node) {
 
-            // href="{{ foo }}://{{ bar }}" or similar, are skipped
-            if (preg_match('{^' . preg_quote($this->options['tag_variable'][0]) . '((' . self::REGEX_STRING . '|[^"\']*)+)' . preg_quote($this->options['tag_variable'][1]) . '$}siuU', str_replace($this->placeholder, '', $node->value))) {
+            // if the twig variable is at the beginning of attribute, we should skip it
+            if (preg_match('{^' . preg_quote($this->options['tag_variable'][0]) . '((' . self::REGEX_STRING . '|[^"\']*)+)' . preg_quote($this->options['tag_variable'][1]) . '}siuU', str_replace($this->placeholder, '', $node->value))) {
                 continue;
             }
 

diff --git a/tests/Goetas/Twital/Tests/ContextAwareEscapingTest.php b/tests/Goetas/Twital/Tests/ContextAwareEscapingTest.php
@@ -138,6 +138,11 @@ public function getData()
                 '<a href="foo?q={{ ( foo )  | escape(\'url\') }}">bar</a>',
             ),
 
+            array(
+                '<a href="{{ foo }}?foo=bar">bar</a>',
+                '<a href="{{ foo }}?foo=bar">bar</a>',
+            ),
+
             array(
                 '<img src="a.gif?a=b&amp;{{ foo }}"/>',
                 '<img src="a.gif?a=b&amp;{{ ( foo )  | escape(\'url\') }}"/>'