summaryrefslogtreecommitdiff
path: root/program/include/rcube_session.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-11-11 15:04:45 +0000
committeralecpl <alec@alec.pl>2011-11-11 15:04:45 +0000
commitecfaed571b2c38f4bcc2b6a0fa39fba15a5126ce (patch)
tree2a19876b7daee9b036fbab5cc7317402b2dd0f57 /program/include/rcube_session.php
parentc82bf6689f47073342f4c42502f75bcaf17e6130 (diff)
- Apply fixes fom trunk up to r5414
Diffstat (limited to 'program/include/rcube_session.php')
-rw-r--r--program/include/rcube_session.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index dd28b098f..582b27efa 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -410,9 +410,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);
}