From 1d773ec0bdca812bd40bd3d908f89cdcbdbd8aa6 Mon Sep 17 00:00:00 2001
From: Andriy Nasinnyk <anasinnyk@ebay.com>
Date: Mon, 16 Mar 2015 15:14:34 +0200
Subject: [PATCH] MAGETWO-34293: Html minification works incorrectly in Layered
Navigation
---
lib/internal/Magento/Framework/View/Template/Html/Minifier.php | 2 +-
.../Framework/View/Test/Unit/Template/Html/MinifierTest.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
index 218e20a4e08..9c3aba6b4ba 100644
--- a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
+++ b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
@@ -113,7 +113,7 @@ class Minifier implements MinifierInterface
{
$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
index 5f160cc753e..5fa18b10320 100644
--- 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 @@ TEXT;
}
});
//]]>
- </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())
--
GitLab