MAGETWO-34293: Html minification works incorrectly in Layered Navigation

AndriyNasinnyk · AndriyNasinnyk · commit 1d773ec0bdca · 2015-03-16T15:14:34.000+02:00
diff --git a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
@@ -113,7 +113,7 @@ public function minify($file)
     {
         $file = $this->rootDirectory->getRelativePath($file);
         $content = preg_replace(
-            '#\s+</#',
+            '#(?<!]]>)\s+</#',
             '</',
             preg_replace(
                 '#((?:<\?php\s+(?!echo)[^\?]*)\?>)\s+#',
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
@@ -133,7 +133,7 @@ public function testMinify()
                 }
             });
             //]]>
-        </script><?php echo "http://some.link.com/" ?> <em>inline text</em></body></html>
+</script><?php echo "http://some.link.com/" ?> <em>inline text</em></body></html>
 TEXT;
 
         $this->appDirectory->expects($this->once())

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public function minify($file)`
`113`	`113`	`{`
`114`	`114`	`$file = $this->rootDirectory->getRelativePath($file);`
`115`	`115`	`$content = preg_replace(`
`116`		`- '#\s+</#',`
	`116`	`+ '#(?<!]]>)\s+</#',`
`117`	`117`	`'</',`
`118`	`118`	`preg_replace(`
`119`	`119`	`'#((?:<\?php\s+(?!echo)[^\?]*)\?>)\s+#',`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public function testMinify()`
`133`	`133`	`}`
`134`	`134`	`});`
`135`	`135`	`//]]>`
`136`		`- </script><?php echo "http://some.link.com/" ?> <em>inline text</em></body></html>`
	`136`	`+</script><?php echo "http://some.link.com/" ?> <em>inline text</em></body></html>`
`137`	`137`	`TEXT;`
`138`	`138`
`139`	`139`	`$this->appDirectory->expects($this->once())`