Merge branch 'MDL-45545-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

2014-05-20 12:21:59 +08:00
parent 7babd6da45 dd8491d234
commit 9ace4d026e
2 changed files with 9 additions and 3 deletions
@@ -189,9 +189,9 @@ function css_chunk_by_selector_count($css, $importurl, $maxselectors = 4095, $bu
            }
        }

-        // Let's count the number of selectors, but only if we are not in a rule as they
-        // can contain commas too.
-        if (!$inrule && $char === ',') {
+        // Let's count the number of selectors, but only if we are not in a rule, or in
+        // the definition of a media query, as they can contain commas too.
+        if (!$mediacoming && !$inrule && $char === ',') {
            $selectorcount++;
        }