aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-08-21 17:16:57 -0700
committerfriendica <info@friendica.com>2013-08-21 17:16:57 -0700
commit3fbf5776384f4f2b8bbb43f6f8cfad26a0cf42dc (patch)
tree8a463a0fec6e0295b8f819995bdfa957b317407c /boot.php
parent2d3a489f5171a8fe8b6b7aeb022c945a689d9f1a (diff)
parentf2545c0b8defd81ec2add5e97d2df41d5eba15fc (diff)
downloadvolse-hubzilla-3fbf5776384f4f2b8bbb43f6f8cfad26a0cf42dc.tar.gz
volse-hubzilla-3fbf5776384f4f2b8bbb43f6f8cfad26a0cf42dc.tar.bz2
volse-hubzilla-3fbf5776384f4f2b8bbb43f6f8cfad26a0cf42dc.zip
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index eeddf8162..0afc976ae 100755
--- a/boot.php
+++ b/boot.php
@@ -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'] : '');