mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-44214-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Damyon Wiese 2014-02-24 14:41:29 +08:00
commit f08c69aba2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/outputrequirementslib.php
View File

@ -1225,8 +1225,13 @@ class page_requirements_manager {
$format = '-debug';
}
$rollupversion = $CFG->yui3version;
if (!empty($CFG->yuipatchlevel)) {
$rollupversion .= '_' . $CFG->yuipatchlevel;
}
$baserollups = array(
'rollup/' . $CFG->yui3version . "/yui-moodlesimple{$yuiformat}.js",
'rollup/' . $rollupversion . "/yui-moodlesimple{$yuiformat}.js",
'rollup/' . $jsrev . "/mcore{$format}.js",
);

3
theme/yui_combo.php
View File

@ -83,7 +83,8 @@ while (count($parts)) {
$version = array_shift($bits);
if ($version === 'rollup') {
$revision = array_shift($bits);
$yuipatchedversion = explode('_', array_shift($bits));
$revision = $yuipatchedversion[0];
$rollupname = array_shift($bits);
if (strpos($rollupname, 'yui-moodlesimple') !== false) {