aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-08-15 22:42:36 -0700
committerfriendica <info@friendica.com>2013-08-15 22:42:36 -0700
commitfc0a9c78a9c6761a37460d93aed033786402731e (patch)
tree8d19b1c0274a986a9974104a4937189e6891bb17
parent1c1449cd821a927bbcbeb7f83c5d1c40a466f520 (diff)
parentb3070cf496e3630a45e9f2ec7679ff277348f1ec (diff)
downloadvolse-hubzilla-fc0a9c78a9c6761a37460d93aed033786402731e.tar.gz
volse-hubzilla-fc0a9c78a9c6761a37460d93aed033786402731e.tar.bz2
volse-hubzilla-fc0a9c78a9c6761a37460d93aed033786402731e.zip
Merge https://github.com/friendica/red into zpull
-rwxr-xr-xboot.php3
-rw-r--r--include/security.php2
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];
}