Merge https://github.com/friendica/red into zpull

2 files changed, 4 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 61f9f5da5..e26dc6fdd 100755
--- a/boot.php
+++ b/boot.php
@@ -1557,8 +1557,9 @@ function profile_load(&$a, $nickname, $profile = '') {
 
 	$a->page['title'] = $a->profile['channel_name'] . " - " . $a->profile['channel_address'] . "@" . $a->get_hostname();
 
-
+	$a->profile['channel_mobile_theme'] = get_pconfig(local_user(),'system', 'mobile_theme');
 	$_SESSION['theme'] = $a->profile['channel_theme'];
+	$_SESSION['mobile-theme'] = $a->profile['channel_mobile_theme'];
 
 	/**
 	 * load/reload current theme info
diff --git a/include/security.php b/include/security.php
index ef4d5a313..115539ae2 100644
--- a/include/security.php
+++ b/include/security.php
@@ -34,6 +34,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	else {
 		$_SESSION['uid'] = $user_record['uid'];
 		$_SESSION['theme'] = $user_record['theme'];
+		$_SESSION['mobile-theme'] = get_pconfig($user_record['uid'], 'system', 'mobile_theme');
 		$_SESSION['authenticated'] = 1;
 		$_SESSION['page_flags'] = $user_record['page-flags'];
 		$_SESSION['my_url'] = $a->get_baseurl() . '/channel/' . $user_record['nickname'];
@@ -148,6 +149,7 @@ function change_channel($change_channel) {
 			$_SESSION['uid'] = intval($r[0]['channel_id']);
 			get_app()->set_channel($r[0]);
 			$_SESSION['theme'] = $r[0]['channel_theme'];
+			$_SESSION['mobile-theme'] = get_pconfig(local_user(),'system', 'mobile_theme');
 			date_default_timezone_set($r[0]['channel_timezone']);
 			$ret = $r[0];
 		}