Updated towards hypolite's first suggestion

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 57abd7711460d4c0a12a50455b30e0da790df43b..b47c38bbabd7f49c9121d534f6c2f1d3acced080 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -93,22 +93,15 @@ if (!$scheme) {
                $schemecssfile = 'view/theme/frio/scheme/default.css';
        }
 }
-//If no scheme was set default to login theme.
-$nav_bg           = (empty($nav_bg)           ? Config::get('frio', 'nav_bg')           : $nav_bg);
-$nav_icon_color   = (empty($nav_icon_color)   ? Config::get('frio', 'nav_icon_color')   : $nav_icon_color);
-$link_color       = (empty($link_color)       ? Config::get('frio', 'link_color')       : $link_color);
-$background_color = (empty($background_color) ? Config::get('frio', 'background_color') : $background_color);
-$background_image = (empty($background_image) ? Config::get('frio', 'background_image') : $background_image);
-
-//If login theme unset default to master default
+
 //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
 //individually.  If we don't, we'll have problems if a user has set one, but not all options.
-$nav_bg           = (empty($nav_bg)           ? '#708fa0'      : $nav_bg);
-$nav_icon_color   = (empty($nav_icon_color)   ? '#fff'         : $nav_icon_color);
-$link_color       = (empty($link_color)       ? '#6fdbe8'      : $link_color);
-$background_color = (empty($background_color) ? '#ededed'      : $background_color);
+$nav_bg           = (empty($nav_bg)           ? Config::get('frio', 'nav_bg', '#708fa0')                : $nav_bg);
+$nav_icon_color   = (empty($nav_icon_color)   ? Config::get('frio', 'nav_icon_color', '#fff')           : $nav_icon_color);
+$link_color       = (empty($link_color)       ? Config::get('frio', 'link_color', '#6fdbe8')            : $link_color);
+$background_color = (empty($background_color) ?  Config::get('frio', 'background_color', '#ededed')     : $background_color);
 // The background image can not be empty. So we use a dummy jpg if no image was set.
-$background_image = (empty($background_image) ? 'img/none.png' : $background_image);
+$background_image = (empty($background_image) ? Config::get('frio', 'background_image', 'img/none.png') : $background_image);
 $modified         = (empty($modified)         ? time()         : $modified);