diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2012-02-15 03:51:44 -0800 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2012-02-15 03:51:44 -0800 |
| commit | 16f00cb73b4d9acbe15e636b3ab69f81c793a6c7 (patch) | |
| tree | 3295a7a41dcff773ecec457c62d8408eb31a396c /mod/settings.php | |
| parent | 07ca8d6574cc8b7f582bc55551290bf5f88ba8e2 (diff) | |
| parent | 73bee08ac2ce4e89ab365d23f431f5e0c465abd6 (diff) | |
| download | volse-hubzilla-16f00cb73b4d9acbe15e636b3ab69f81c793a6c7.tar.gz volse-hubzilla-16f00cb73b4d9acbe15e636b3ab69f81c793a6c7.tar.bz2 volse-hubzilla-16f00cb73b4d9acbe15e636b3ab69f81c793a6c7.zip | |
Merge pull request #36 from fabrixxm/master
Missing icons in 'quattro' and ajax events calendar
Diffstat (limited to 'mod/settings.php')
| -rwxr-xr-x | mod/settings.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mod/settings.php b/mod/settings.php index b4cd2e608..57a4e6db0 100755 --- a/mod/settings.php +++ b/mod/settings.php @@ -734,8 +734,11 @@ function settings_content(&$a) { if($files) { foreach($files as $file) { $f = basename($file); - $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f); - $themes[$f]=$theme_name; + $is_experimental = file_exists($file . '/experimental'); + if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){ + $theme_name = (($is_experimental) ? sprintf("%s - \x28Experimental\x29", $f) : $f); + $themes[$f]=$theme_name; + } } } $theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']); |