Merge branch 'MDL-65438-master' of git://github.com/bmbrands/moodle

[moodle.git] / lib / outputlib.php

diff --git a/lib/outputlib.php b/lib/outputlib.php
index 745a33c..b568f28 100644 (file)
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -739,7 +739,11 @@ class theme_config {
         $this->name     = $config->name;
         $this->dir      = $config->dir;
 
-        $baseconfig = $config;
+        if ($this->name != self::DEFAULT_THEME) {
+            $baseconfig = self::find_theme_config(self::DEFAULT_THEME, $this->settings);
+        } else {
+            $baseconfig = $config;
+        }
 
         $configurable = array(
             'parents', 'sheets', 'parents_exclude_sheets', 'plugins_exclude_sheets', 'usefallback',