summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2012-02-25 15:01:30 +0000
committerthomascube <thomas@roundcube.net>2012-02-25 15:01:30 +0000
commit40d246fff24e19f7237aef059a95e3af3b718e62 (patch)
treefc9540e4c554901a281d4ae78389f51533dfb033 /program/include
parent1e09cd081107b4e4e639e599c4c95406559be111 (diff)
Remember custom skin selection after logout (#1488355)
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcmail.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 9d1190ad6..05cfefa06 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -777,6 +777,10 @@ class rcmail
// set initial session vars
if (!$_SESSION['user_id'])
$_SESSION['temp'] = true;
+
+ // restore skin selection after logout
+ if ($_SESSION['temp'] && !empty($_SESSION['skin']))
+ $this->config->set('skin', $_SESSION['skin']);
}
@@ -1221,7 +1225,7 @@ class rcmail
$this->plugins->exec_hook('session_destroy');
$this->session->kill();
- $_SESSION = array('language' => $this->user->language, 'temp' => true);
+ $_SESSION = array('language' => $this->user->language, 'temp' => true, 'skin' => $this->config->get('skin'));
$this->user->reset();
}