- Fix: skip redundant cache queries when an entry doesn't exist

git-svn-id: https://svn.roundcube.net/trunk@5303 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 23 insertions, 16 deletions

diff --git a/roundcubemail/program/include/rcube_cache.php b/roundcubemail/program/include/rcube_cache.php
index ee9439101..69f5b3176 100644
--- a/roundcubemail/program/include/rcube_cache.php
+++ b/roundcubemail/program/include/rcube_cache.php
@@ -245,26 +245,30 @@ class rcube_cache
             return null;
         }
 
-        if ($this->type == 'memcache') {
-            $data = $this->db->get($this->ckey($key));
-        }
-        else if ($this->type == 'apc') {
-            $data = apc_fetch($this->ckey($key));
-	    }
+        if ($this->type != 'db') {
+            if ($this->type == 'memcache') {
+                $data = $this->db->get($this->ckey($key));
+            }
+            else if ($this->type == 'apc') {
+                $data = apc_fetch($this->ckey($key));
+	        }
 
-        if ($data) {
-            $md5sum = md5($data);
-            $data   = $this->packed ? unserialize($data) : $data;
+            if ($data) {
+                $md5sum = md5($data);
+                $data   = $this->packed ? unserialize($data) : $data;
 
-            if ($nostore) {
-                return $data;
-            }
+                if ($nostore) {
+                    return $data;
+                }
 
-            $this->cache_sums[$key] = $md5sum;
-            $this->cache[$key]      = $data;
+                $this->cache_sums[$key] = $md5sum;
+                $this->cache[$key]      = $data;
+            }
+            else if (!$nostore) {
+                $this->cache[$key] = null;
+            }
         }
-
-        if ($this->type == 'db') {
+        else {
             $sql_result = $this->db->limitquery(
                 "SELECT cache_id, data, cache_key".
                 " FROM ".get_table_name('cache').
@@ -290,6 +294,9 @@ class rcube_cache
 	            $this->cache_sums[$key] = $md5sum;
                 $this->cache_keys[$key] = $sql_arr['cache_id'];
             }
+            else if (!$nostore) {
+                $this->cache[$key] = null;
+            }
         }
 
         return $this->cache[$key];