summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-11-11 12:12:28 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-11-11 12:12:28 +0000
commit1413416c9f53a676f7c68eaa79bf7e93be8cfa00 (patch)
treed9651415bb6f1a011a3970b327d0b6ca2318e803
parent235c5c38342dfdbcb543208338813ba03675682e (diff)
Fix: decode session data into superglobals after re-reading
git-svn-id: https://svn.roundcube.net/trunk@5414 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/program/include/rcube_session.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/roundcubemail/program/include/rcube_session.php b/roundcubemail/program/include/rcube_session.php
index 22aa55016..7c6097392 100644
--- a/roundcubemail/program/include/rcube_session.php
+++ b/roundcubemail/program/include/rcube_session.php
@@ -399,9 +399,12 @@ class rcube_session
public function reload()
{
if ($this->key && $this->memcache)
- $this->mc_read($this->key);
+ $data = $this->mc_read($this->key);
else if ($this->key)
- $this->db_read($this->key);
+ $data = $this->db_read($this->key);
+
+ if ($data)
+ session_decode($data);
}