diff options
| author | friendica <info@friendica.com> | 2013-08-21 17:16:57 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-08-21 17:16:57 -0700 |
| commit | 3fbf5776384f4f2b8bbb43f6f8cfad26a0cf42dc (patch) | |
| tree | 8a463a0fec6e0295b8f819995bdfa957b317407c | |
| parent | 2d3a489f5171a8fe8b6b7aeb022c945a689d9f1a (diff) | |
| parent | f2545c0b8defd81ec2add5e97d2df41d5eba15fc (diff) | |
| download | volse-hubzilla-3fbf5776384f4f2b8bbb43f6f8cfad26a0cf42dc.tar.gz volse-hubzilla-3fbf5776384f4f2b8bbb43f6f8cfad26a0cf42dc.tar.bz2 volse-hubzilla-3fbf5776384f4f2b8bbb43f6f8cfad26a0cf42dc.zip | |
Merge https://github.com/friendica/red into zpull
| -rwxr-xr-x | boot.php | 4 | ||||
| -rw-r--r-- | mod/admin.php | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -1962,8 +1962,8 @@ function current_theme(){ if($is_mobile) { if(isset($_SESSION['show_mobile']) && !$_SESSION['show_mobile']) { - $system_theme = ''; - $theme_name = ''; + $system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : ''); + $theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme); } else { $system_theme = ((isset($a->config['system']['mobile_theme'])) ? $a->config['system']['mobile_theme'] : ''); diff --git a/mod/admin.php b/mod/admin.php index df1a40019..7e8f7a301 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -365,11 +365,11 @@ function admin_page_site(&$a) { if($files) { foreach($files as $file) { $f = basename($file); - $theme_name = ((file_exists($file . '/.experimental')) ? sprintf("%s - Experimental", $f) : $f); - if (file_exists($file . '/.mobile')) { + $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - Experimental", $f) : $f); + if (file_exists($file . '/mobile')) { $theme_choices_mobile[$f] = $theme_name; } - if (file_exists($file . '/.accessibility')) { + if (file_exists($file . '/accessibility')) { $theme_choices_accessibility[$f] = $theme_name; } $theme_choices[$f] = $theme_name; |