diff options
| -rwxr-xr-x | boot.php | 22 | ||||
| -rw-r--r-- | mod/toggle_mobile.php | 4 |
2 files changed, 16 insertions, 10 deletions
@@ -1964,13 +1964,19 @@ function current_theme(){ $is_mobile = $a->is_mobile || $a->is_tablet; if($is_mobile) { - $system_theme = ((isset($a->config['system']['mobile_theme'])) ? $a->config['system']['mobile_theme'] : ''); - $theme_name = ((isset($_SESSION) && x($_SESSION,'mobile_theme')) ? $_SESSION['mobile_theme'] : $system_theme); - - if($theme_name === '---') { - // user has selected to have the mobile theme be the same as the normal one - $system_theme = ''; - $theme_name = ''; + if(isset($_SESSION['show_mobile']) && !$_SESSION['show_mobile']) { + $system_theme = ''; + $theme_name = ''; + } + else { + $system_theme = ((isset($a->config['system']['mobile_theme'])) ? $a->config['system']['mobile_theme'] : ''); + $theme_name = ((isset($_SESSION) && x($_SESSION,'mobile_theme')) ? $_SESSION['mobile_theme'] : $system_theme); + + if($theme_name === '---') { + // user has selected to have the mobile theme be the same as the normal one + $system_theme = ''; + $theme_name = ''; + } } } else { @@ -2345,7 +2351,7 @@ function construct_page(&$a) { } if($a->is_mobile || $a->is_tablet) { - if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) { + if(isset($_SESSION['show_mobile']) && !$_SESSION['show_mobile']) { $link = $a->get_baseurl() . '/toggle_mobile?f=&address=' . curPageURL(); } else { diff --git a/mod/toggle_mobile.php b/mod/toggle_mobile.php index 00991e44c..06dadca04 100644 --- a/mod/toggle_mobile.php +++ b/mod/toggle_mobile.php @@ -3,9 +3,9 @@ function toggle_mobile_init(&$a) { if(isset($_GET['off'])) - $_SESSION['show-mobile'] = false; + $_SESSION['show_mobile'] = false; else - $_SESSION['show-mobile'] = true; + $_SESSION['show_mobile'] = true; if(isset($_GET['address'])) $address = $_GET['address']; |