From ecfaed571b2c38f4bcc2b6a0fa39fba15a5126ce Mon Sep 17 00:00:00 2001 From: alecpl Date: Fri, 11 Nov 2011 15:04:45 +0000 Subject: - Apply fixes fom trunk up to r5414 --- program/include/rcube_session.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'program/include/rcube_session.php') 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); } -- cgit v1.2.3