From ead2f3375ad8f623b6b15aa4c7194224575b3c41 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 13 Sep 2010 13:37:13 -0700 Subject: Ticket #2701: old color settings now get reset when changing themes, so you don't end up with the previous theme's colors. --- actions/designadminpanel.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php index 763737175..e3d772f7d 100644 --- a/actions/designadminpanel.php +++ b/actions/designadminpanel.php @@ -154,9 +154,22 @@ class DesignadminpanelAction extends AdminPanelAction $config->query('BEGIN'); - // Only update colors if the theme has not changed. - - if (!$themeChanged) { + if ($themeChanged) { + // If the theme has changed, reset custom colors and let them pick + // up the new theme's defaults. + $colors = array('background', 'content', 'sidebar', 'text', 'link'); + foreach ($colors as $colorKey) { + // Clear from global config so we see defaults on this page... + $GLOBALS['config']['design'][$colorKey . 'color'] = false; + + // And remove old settings from DB... + $this->deleteSetting('design', $colorKey . 'color'); + } + } else { + // Only save colors from the form if the theme has not changed. + // + // @fixme a future more ajaxy form should allow theme switch + // and color customization in one step. $bgcolor = new WebColor($this->trimmed('design_background')); $ccolor = new WebColor($this->trimmed('design_content')); -- cgit v1.2.3-54-g00ecf