Merge branch 'MDL-57127-master' of git://github.com/FMCorz/moodle

2016-11-30 14:27:23 +08:00
parent f4aec377fc 061a39ac5d
commit 432ed35484
1 changed files with 4 additions and 0 deletions
@@ -1573,6 +1573,10 @@ class theme_config {
        $treeprocessor = $this->get_css_tree_post_processor();
        $needsparsing = !empty($treeprocessor) || !empty($this->rtlmode);
        if ($needsparsing) {
+
+            // We might need more memory to do this, so let's play safe.
+            raise_memory_limit(MEMORY_EXTRA);
+
            $parser = new core_cssparser($css);
            $csstree = $parser->parse();
            unset($parser);