L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-57319-master' of git://github.com/danpoltawski/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2016-12-12 16:23:14 +01:00
parent e36d9b3ead 1081de20e1
commit 00759c909c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/outputlib.php
+6 -3
View File
@@ -1130,8 +1130,9 @@ class theme_config {
throw new coding_exception('The theme did not define a LESS file, or it is not readable.');
}
// We might need more memory to do this, so let's play safe.
// We might need more memory/time to do this, so let's play safe.
raise_memory_limit(MEMORY_EXTRA);
core_php_time_limit::raise(300);
// Files list.
$files = $this->get_css_files($themedesigner);
@@ -1195,8 +1196,9 @@ class theme_config {
throw new coding_exception('The theme did not define a SCSS file, or it is not readable.');
}
// We might need more memory to do this, so let's play safe.
// We might need more memory/time to do this, so let's play safe.
raise_memory_limit(MEMORY_EXTRA);
core_php_time_limit::raise(300);
// Set-up the compiler.
$compiler = new core_scss();
@@ -1574,8 +1576,9 @@ class theme_config {
$needsparsing = !empty($treeprocessor) || !empty($this->rtlmode);
if ($needsparsing) {
// We might need more memory to do this, so let's play safe.
// We might need more memory/time to do this, so let's play safe.
raise_memory_limit(MEMORY_EXTRA);
core_php_time_limit::raise(300);
$parser = new core_cssparser($css);
$csstree = $parser->parse();