More steps for mobile theme toggling + dash elimination
This commit is contained in:
parent
8bac352b1c
commit
5c0220df09
8
boot.php
8
boot.php
@ -1964,6 +1964,11 @@ function current_theme(){
|
||||
$is_mobile = $a->is_mobile || $a->is_tablet;
|
||||
|
||||
if($is_mobile) {
|
||||
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);
|
||||
|
||||
@ -1973,6 +1978,7 @@ function current_theme(){
|
||||
$theme_name = '';
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
|
||||
$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
|
||||
@ -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 {
|
||||
|
@ -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'];
|
||||
|
Reference in New Issue
Block a user