Merge branch 'MDL-65708-master' of git://github.com/Chocolate-lightning/moodle

2019-05-27 14:46:41 +08:00
parent 3d9ffc97c6 4028ffd8f6
commit 412eb4cdf6
1 changed files with 5 additions and 1 deletions
@@ -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',