Permalink
Browse files

MDL-36946 theme Use server default theme before standard

  • Loading branch information...
1 parent 5e6b645 commit 7a9e25340502774bc74a1b085c79945aeaa53ba4 @micaherne micaherne committed with Sam Hemelryk Nov 30, 2012
Showing with 3 additions and 0 deletions.
  1. +3 −0 lib/outputlib.php
View
3 lib/outputlib.php
@@ -364,6 +364,9 @@ public static function load($themename) {
} else if ($themename == theme_config::DEFAULT_THEME) {
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)) {
+ return new theme_config($config);
+
} else {
// bad luck, the requested theme has some problems - admin see details in theme config
return new theme_config(theme_config::find_theme_config(theme_config::DEFAULT_THEME, $settings));

0 comments on commit 7a9e253

Please sign in to comment.