harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More steps for mobile theme toggling + dash elimination

Browse Source
This commit is contained in:
Christian Vogeley 2013-08-19 01:08:15 +02:00
parent 8bac352b1c
commit 5c0220df09
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
boot.php
View File

@ -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(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 = '';
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 {

4
mod/toggle_mobile.php
View File

@ -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'];