settings: ensure system theme is default selection

diff --git a/mod/settings.php b/mod/settings.php
index 0f01807a20af74bf99a873d762bb9bbe2c75ce6b..a40883f350f3932c06133270cc4b07516c7f3319 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -291,10 +291,15 @@ function settings_content(&$a) {
 
        $theme_selector = '<select name="theme" id="theme-select" >';
        $files = glob('view/theme/*');
+
+       $default_theme = get_config('system','theme');
+       if(! $default_theme)
+               $default_theme = 'default';
+
        if($files) {
                foreach($files as $file) {
                        $f = basename($file);
-                       $selected = (($f == $_SESSION['theme']) || ($f === 'default' && (! x($_SESSION,'theme')))
+                       $selected = (($f == $_SESSION['theme']) || ($f === $default_theme && (! x($_SESSION,'theme')))
                                ? ' selected="selected" ' : '' );
                        $theme_selector .= '<option val="' . basename($file) . '"' . $selected . '>' . basename($file) . '</option>';
                }