mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

MDL-38000 css: fixed handling of CSS files by outputlib.

Browse Source
This commit is contained in:
Sam Hemelryk 2013-02-13 14:47:24 +13:00
parent 1dd6835d8c
commit 04cfa387f9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/outputlib.php
View File

@ -823,10 +823,12 @@ class theme_config {
protected function css_files_get_contents($file, array $keys, css_optimiser $optimiser = null) {
global $CFG;
if (is_array($file)) {
// We use a separate array to keep everything in the exact same order.
$return = array();
foreach ($file as $key=>$f) {
$file[$key] = $this->css_files_get_contents($f, array_merge($keys, array($key)), $optimiser);
$return[clean_param($key, PARAM_SAFEDIR)] = $this->css_files_get_contents($f, array_merge($keys, array($key)), $optimiser);
}
return $file;
return $return;
} else {
$contents = file_get_contents($file);
$contents = $this->post_process($contents);
@ -922,7 +924,6 @@ class theme_config {
}
}
}
return $js;
}