diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-04 09:22:43 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-04 09:22:43 +0100 |
| commit | 51bcfb649fe2a20c9b8b1e66bc59e39da80d326b (patch) | |
| tree | ef804b85942d5774a2c680d9696b65f3dc88d417 /mod/settings.php | |
| parent | f3005918aff04fc435d0f526bf235bd95468294c (diff) | |
| parent | f057cc3a70dd7435b4e9e8a2a07406f0f25e3f2a (diff) | |
| download | volse-hubzilla-51bcfb649fe2a20c9b8b1e66bc59e39da80d326b.tar.gz volse-hubzilla-51bcfb649fe2a20c9b8b1e66bc59e39da80d326b.tar.bz2 volse-hubzilla-51bcfb649fe2a20c9b8b1e66bc59e39da80d326b.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/settings.php')
| -rw-r--r-- | mod/settings.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mod/settings.php b/mod/settings.php index 0f01807a2..a40883f35 100644 --- 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>'; } |