- CurlyBracketsFilter: fixed </tag> parsing in <script>

lm · May 4, 2009 · a35ddcd · a35ddcd
1 parent 588552c
commit a35ddcd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Nette/Templates/Filters/CurlyBracketsFilter.php b/Nette/Templates/Filters/CurlyBracketsFilter.php
@@ -266,7 +266,7 @@ private function cbContent($matches)
 			}
 
 		} else { // </tag
-			if ($this->context === self::CONTEXT_TEXT || $this->context === self::CONTEXT_CDATA) {
+			if ($this->context === self::CONTEXT_TEXT || ($this->context === self::CONTEXT_CDATA && $this->tag === strtolower($matches[2]))) {
 				$this->context = self::CONTEXT_TAG;
 				$this->escape = 'TemplateHelpers::escapeHtml';
 				$this->tag = NULL;

diff --git a/tests/Templates/ref/test.curlyBrackets.php.html b/tests/Templates/ref/test.curlyBrackets.php.html
@@ -53,6 +53,8 @@ <h1>Nette\Templates\CurlyBracketsFilter test</h1>
 
 <script>
 <!--
+alert('</div>');
+
 var prop = ["John","Mary","Paul"];
 
 document.getElementById(":\/item").style.backgroundColor = 'red';

diff --git a/tests/Templates/templates/curly-brackets.phtml b/tests/Templates/templates/curly-brackets.phtml
@@ -52,6 +52,8 @@ comment *}
 
 <script>
 <!--
+alert('</div>');
+
 var prop = {$people};
 
 document.getElementById({$id}).style.backgroundColor = 'red';