From 4028ffd8f67df9cdf169914e91595185f39d9be2 Mon Sep 17 00:00:00 2001 From: Mathew May Date: Fri, 24 May 2019 16:39:15 +0800 Subject: [PATCH] MDL-65708 output: Get a base config from Boost As a part of the removal of bootstrapbase & clean I removed some logic that got the base config of bootstrapbase, this should of been changed to get boosts config. See: e00f1c663c1 --- lib/outputlib.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/outputlib.php b/lib/outputlib.php index a62786a6c41..5a2c8319346 100644 --- 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',