Remember custom skin selection after logout (#1488355)

2 files changed, 6 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 37bcc65b8..c96c3b565 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Remember custom skin selection after logout (#1488355)
 - Make sure About tab is always the last tab (#1488257)
 - Fix issue with folder creation under INBOX. namespace (#1488349)
 - Added mailto: protocol handler registration link in User Preferences (#1486580)
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();
   }