X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=f0f8e9d7a5c61b26c9dcdda2a8576b3a298533c8;hb=e54414692e6b302cbd3bee88587d3f12c812bf1a;hp=6e1951bffdaed607090a7b5988bfcb1f95f47cb2;hpb=4463ae11d840e812e7cde408a272571a0f4f8bce;p=friendica.git diff --git a/boot.php b/boot.php index 6e1951bffd..f0f8e9d7a5 100644 --- a/boot.php +++ b/boot.php @@ -1476,17 +1476,20 @@ if(! function_exists('current_theme')) { if($is_mobile) { if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) { - $system_theme = ''; - $theme_name = ''; + $system_theme = $standard_system_theme; + $theme_name = $standard_theme_name; } 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); if($theme_name === '---') { // user has selected to have the mobile theme be the same as the normal one - $system_theme = ''; - $theme_name = ''; + $system_theme = $standard_system_theme; + $theme_name = $standard_theme_name; + + if($page_theme) + $theme_name = $page_theme; } } }