clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1724 from rabuzarus/theme_uid 

fix mobile-view
This commit is contained in:
Tobias Diekershoff 2015-07-04 07:14:24 +02:00
parent 75998b62de a0b522c3be
commit 08f276f87b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
boot.php
View File

@ -1476,17 +1476,20 @@ if(! function_exists('current_theme')) {
if($is_mobile) { if($is_mobile) {
if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) { if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
$system_theme = ''; $system_theme = $standard_system_theme;
$theme_name = ''; $theme_name = $standard_theme_name;
} }
else { else {
$system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : ''); $system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : $standard_system_theme);
$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme); $theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
if($theme_name === '---') { if($theme_name === '---') {
// user has selected to have the mobile theme be the same as the normal one // user has selected to have the mobile theme be the same as the normal one
$system_theme = ''; $system_theme = $standard_system_theme;
$theme_name = ''; $theme_name = $standard_theme_name;
if($page_theme)
$theme_name = $page_theme;
} }
} }
} }