moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-56911-master' of git://github.com/ankitagarwal/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2016-11-16 10:33:09 +01:00
commit e7b9ea226c
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/outputlib.php
View file

@ -1513,6 +1513,13 @@ class theme_config {
} }
} }
// Now resolve all theme settings or do any other postprocessing.
// This needs to be done before calling core parser, since the parser strips [[settings]] tags.
$csspostprocess = $this->csspostprocess;
if (function_exists($csspostprocess)) {
$css = $csspostprocess($css, $this);
}
// Post processing using an object representation of CSS. // Post processing using an object representation of CSS.
$hastreeprocessor = !empty($this->csstreepostprocessor) && function_exists($this->csstreepostprocessor); $hastreeprocessor = !empty($this->csstreepostprocessor) && function_exists($this->csstreepostprocessor);
$needsparsing = $hastreeprocessor || !empty($this->rtlmode); $needsparsing = $hastreeprocessor || !empty($this->rtlmode);
@ -1534,12 +1541,6 @@ class theme_config {
unset($csstree); unset($csstree);
} }
// now resolve all theme settings or do any other postprocessing
$csspostprocess = $this->csspostprocess;
if (function_exists($csspostprocess)) {
$css = $csspostprocess($css, $this);
}
return $css; return $css;
} }