aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-08-21 16:45:16 -0700
committerfriendica <info@friendica.com>2013-08-21 16:45:16 -0700
commitf2545c0b8defd81ec2add5e97d2df41d5eba15fc (patch)
treecc418123094857acc0ec709fd56579460e66a702 /boot.php
parentd8ef1417fb2ff8d736e4392c118c51c63dc66b1d (diff)
parentab06b18f5b618bc2df80f309e6c9f1d10a6ba88f (diff)
downloadvolse-hubzilla-f2545c0b8defd81ec2add5e97d2df41d5eba15fc.tar.gz
volse-hubzilla-f2545c0b8defd81ec2add5e97d2df41d5eba15fc.tar.bz2
volse-hubzilla-f2545c0b8defd81ec2add5e97d2df41d5eba15fc.zip
Merge pull request #103 from cvogeley/master
More mobile stuff
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 2323e302c..4ebe7e2ec 100755
--- a/boot.php
+++ b/boot.php
@@ -1965,8 +1965,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'] : '');