mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +02:00
MDL-42152 fix broken theme->yuicssmodules support
This commit is contained in:
parent
d3e5f04671
commit
2cd519fb71
1 changed files with 4 additions and 6 deletions
|
@ -1261,17 +1261,16 @@ class page_requirements_manager {
|
|||
|
||||
if ($this->yui3loader->combine) {
|
||||
if (!empty($page->theme->yuicssmodules)) {
|
||||
$code .= '<script type="text/javascript" src="'.$this->yui3loader->local_comboBase
|
||||
. implode('&', $baserollups) . '"></script>';
|
||||
$code .= '<script type="text/javascript" src="'.$this->yui3loader->local_comboBase
|
||||
. implode('&', $moodlerollups) . '"></script>';
|
||||
|
||||
$modules = array();
|
||||
foreach ($page->theme->yuicssmodules as $module) {
|
||||
$modules[] = "$CFG->yui3version/$module/$module-min.css";
|
||||
}
|
||||
$code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->comboBase.implode('&', $modules).'" />';
|
||||
}
|
||||
$code .= '<script type="text/javascript" src="'.$this->yui3loader->local_comboBase
|
||||
. implode('&', $baserollups) . '"></script>';
|
||||
$code .= '<script type="text/javascript" src="'.$this->yui3loader->local_comboBase
|
||||
. implode('&', $moodlerollups) . '"></script>';
|
||||
|
||||
} else {
|
||||
if (!empty($page->theme->yuicssmodules)) {
|
||||
|
@ -1294,7 +1293,6 @@ class page_requirements_manager {
|
|||
$code = str_replace('-min.css', '.css', $code);
|
||||
$code = str_replace('-min.js', '-debug.js', $code);
|
||||
}
|
||||
|
||||
return $code;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue