From 2211f504224b2ae02f123da5622cbd9b9723b9c0 Mon Sep 17 00:00:00 2001 From: Michael Aherne Date: Fri, 30 Nov 2012 12:11:07 +0000 Subject: [PATCH] MDL-36946 theme Use server default theme before standard --- lib/outputlib.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/outputlib.php b/lib/outputlib.php index da1761b216c..530ba31e448 100644 --- a/lib/outputlib.php +++ b/lib/outputlib.php @@ -364,6 +364,9 @@ class theme_config { } 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));