Merge pull request #168 from magento-troll/MAGETWO-35068

[Troll] Bugfixes
magento · Mar 19, 2015 · 68ce6af · 68ce6af
2 parents 7ab8211 + 27330a1
commit 68ce6af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Collection.php b/app/code/Magento/Reports/Model/Resource/Report/Collection.php
@@ -232,7 +232,7 @@ protected function _getYearInterval(\DateTime $dateStart, \DateTime $dateEnd, $f
         $interval = [];
         $interval['period'] = $dateStart->format('Y');
         $interval['start'] = $firstInterval
-            ? $dateStart->format('Y-m-dd 00:00:00')
+            ? $dateStart->format('Y-m-d 00:00:00')
             : $dateStart->format('Y-01-01 00:00:00');
 
         $interval['end'] = $dateStart->diff($dateEnd)->y == 0

diff --git a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
@@ -112,7 +112,7 @@ require([
         period_date_from.adviceContainer = $('<?php echo $block->getSuffixId('period_date_from_advice')?>');
         period_date_to.adviceContainer = $('<?php echo $block->getSuffixId('period_date_to_advice')?>');
 
-        validateFilterDate = function() {
+        var validateFilterDate = function() {
             if (period_date_from && period_date_to) {
                 var valid = true;
                 jQuery(period_date_from).add(period_date_to).each(function() {

diff --git a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
@@ -116,17 +116,17 @@ public function minify($file)
             '#(?<!]]>)\s+</#',
             '</',
             preg_replace(
-                '#((?:<\?php\s+(?!echo)[^\?]*)\?>)\s+#',
+                '#((?:<\?php\s+(?!echo|print)[^\?]*)\?>)\s+#',
                 '$1',
                 preg_replace(
                     '#(?<!' . implode('|', $this->inlineHtmlTags) . ')\> \<#',
                     '><',
                     preg_replace(
-                        '#(?ix)(?>[^\S ]\s*|\s{2,})(?=(?:(?:[^<]++|<(?!/?(?:textarea|pre|script)\b))*+)'
-                        . '(?:<(?>textarea|pre|script)\b|\z))#',
+                        '#(?ix)(?>[^\S ]\s*|\s{2,})(?=(?:(?:[^<]++|<(?!/?(?:textarea|pre|script|style)\b))*+)'
+                        . '(?:<(?>textarea|pre|script|style)\b|\z))#',
                         ' ',
                         preg_replace(
-                            '#(?<!:)//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*#',
+                            '#(?<!:|\\\\)//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*#',
                             '',
                             preg_replace(
                                 '#(?<!:)//[^\n\r]*(\s\?\>)#',