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

Merge branch 'MDL-58035_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2017-03-10 18:09:28 +00:00
parent 3fe3805d79 ed961702c6
commit b6a8a31088
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/outputlib.php
+5
View File
@@ -447,10 +447,15 @@ class theme_config {
throw new coding_exception('Default theme '.theme_config::DEFAULT_THEME.' not available or broken!');
} else if ($config = theme_config::find_theme_config($CFG->theme, $settings)) {
debugging('This page should be using theme ' . $themename .
' which cannot be initialised. Falling back to the site theme ' . $CFG->theme, DEBUG_NORMAL);
return new theme_config($config);
} else {
// bad luck, the requested theme has some problems - admin see details in theme config
debugging('This page should be using theme ' . $themename .
' which cannot be initialised. Nor can the site theme ' . $CFG->theme .
'. Falling back to ' . theme_config::DEFAULT_THEME, DEBUG_NORMAL);
return new theme_config(theme_config::find_theme_config(theme_config::DEFAULT_THEME, $settings));
}
}