From b7354a69aee4038bef7dcd7939b0f89c15a9911c Mon Sep 17 00:00:00 2001 From: thomasb Date: Sat, 30 Apr 2011 17:01:59 +0000 Subject: Don't attempt to read session data again if the initial read didn't return a result git-svn-id: https://svn.roundcube.net/trunk@4713 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_session.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roundcubemail/program/include') diff --git a/roundcubemail/program/include/rcube_session.php b/roundcubemail/program/include/rcube_session.php index 9f636b0d2..eca8450af 100644 --- a/roundcubemail/program/include/rcube_session.php +++ b/roundcubemail/program/include/rcube_session.php @@ -163,7 +163,7 @@ class rcube_session $now = $this->db->fromunixtime((int)$ts); // use internal data from read() for fast requests (up to 0.5 sec.) - if ($key == $this->key && $ts - $this->start < 0.5) { + if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5)) { $oldvars = $this->vars; } else { // else read data again from DB $oldvars = $this->db_read($key); @@ -289,7 +289,7 @@ class rcube_session $ts = microtime(true); // use internal data for fast requests (up to 0.5 sec.) - if ($key == $this->key && $ts - $this->start < 0.5) + if ($key == $this->key && !($this->vars || $ts - $this->start < 0.5)) $oldvars = $this->vars; else // else read data again $oldvars = $this->mc_read($key); -- cgit v1.2.3