Merge pull request #1724 from rabuzarus/theme_uid

fix mobile-view

diff --git a/boot.php b/boot.php
index 6e1951bffdaed607090a7b5988bfcb1f95f47cb2..f0f8e9d7a5c61b26c9dcdda2a8576b3a298533c8 100644 (file)
--- 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;
                                }
                        }
                }