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

alecpl

2011-10-03 03079a5a51adb2020fadd9fc2d7bf54049f82f43

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

 program/include/rcube_cache.php

@@ -245,26 +245,30 @@
            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 ($data) {
            $md5sum = md5($data);
            $data   = $this->packed ? unserialize($data) : $data;

            if ($nostore) {
                return $data;
        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));
            }

            $this->cache_sums[$key] = $md5sum;
            $this->cache[$key]      = $data;
            if ($data) {
                $md5sum = md5($data);
                $data   = $this->packed ? unserialize($data) : $data;

                if ($nostore) {
                    return $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 @@
                $this->cache_sums[$key] = $md5sum;
                $this->cache_keys[$key] = $sql_arr['cache_id'];
            }
            else if (!$nostore) {
                $this->cache[$key] = null;
            }
        }

        return $this->cache[$key];