Merge branch 'release-0.7' of github.com:roundcube/roundcubemail into relea...

Thomas Bruederli

2012-08-09 a8e478c07cd0a954e2d061b49a18ee9fc1552f6e

 program/include/rcube_cache.php

@@ -264,7 +264,7 @@
                $this->cache_sums[$key] = $md5sum;
                $this->cache[$key]      = $data;
            }
            else if (!$nostore) {
            else {
                $this->cache[$key] = null;
            }
        }
@@ -294,7 +294,7 @@
               $this->cache_sums[$key] = $md5sum;
                $this->cache_keys[$key] = $sql_arr['cache_id'];
            }
            else if (!$nostore) {
            else {
                $this->cache[$key] = null;
            }
        }
@@ -461,10 +461,13 @@
     */
    private function delete_record($key, $index=true)
    {
        if ($this->type == 'memcache')
            $this->db->delete($this->ckey($key));
        else
        if ($this->type == 'memcache') {
            // #1488592: use 2nd argument
            $this->db->delete($this->ckey($key), 0);
        }
        else {
            apc_delete($this->ckey($key));
        }

        if ($index) {
            if (($idx = array_search($key, $this->index)) !== false) {