Merge pull request #3463 from friendica/develop

[friendica.git] / include / cache.php

diff --git a/include/cache.php b/include/cache.php
index 45938dddf86b736d22b45bf8dcd849e4efb0f821..b56906c54492d95033e073df544ab61505b6029a 100644 (file)
--- a/include/cache.php
+++ b/include/cache.php
@@ -5,8 +5,8 @@
  * @brief Class for storing data for a short time
  */
 
-use \Friendica\Core\Config;
-use \Friendica\Core\PConfig;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 class Cache {
        /**
@@ -84,9 +84,14 @@ class Cache {
                $memcache = self::memcache();
                if (is_object($memcache)) {
                        // We fetch with the hostname as key to avoid problems with other applications
-                       $value = $memcache->get(get_app()->get_hostname().":".$key);
-                       if (!is_bool($value)) {
-                               return unserialize($value);
+                       $cached = $memcache->get(get_app()->get_hostname().":".$key);
+                       $value = @unserialize($cached);
+
+                       // Only return a value if the serialized value is valid.
+                       // We also check if the db entry is a serialized
+                       // boolean 'false' value (which we want to return).
+                       if ($cached === serialize(false) || $value !== false) {
+                               return $value;
                        }
 
                        return null;
@@ -99,8 +104,16 @@ class Cache {
                        dbesc($key)
                );
 
-               if (count($r)) {
-                       return $r[0]['v'];
+               if (dbm::is_result($r)) {
+                       $cached = $r[0]['v'];
+                       $value = @unserialize($cached);
+
+                       // Only return a value if the serialized value is valid.
+                       // We also check if the db entry is a serialized
+                       // boolean 'false' value (which we want to return).
+                       if ($cached === serialize(false) || $value !== false) {
+                               return $value;
+                       }
                }
 
                return null;
@@ -109,6 +122,8 @@ class Cache {
        /**
         * @brief Put data in the cache according to the key
         *
+        * The input $value can have multiple formats.
+        *
         * @param string $key The key to the cached data
         * @param mixed $valie The value that is about to be stored
         * @param integer $duration The cache lifespan
@@ -126,7 +141,7 @@ class Cache {
                /// @todo store the cache data in the same way like the config data
                q("REPLACE INTO `cache` (`k`,`v`,`expire_mode`,`updated`) VALUES ('%s','%s',%d,'%s')",
                                dbesc($key),
-                               dbesc($value),
+                               dbesc(serialize($value)),
                                intval($duration),
                                dbesc(datetime_convert()));
        }
@@ -171,7 +186,7 @@ class Cache {
                        set_config("system", "cache_cleared_half_hour", time());
                }
 
-               if (($max_level <= CACHE_QUARTER_HOUR) AND (get_config("system", "cache_cleared_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) {
+               if (($max_level <= CACHE_QUARTER_HOUR) AND (get_config("system", "cache_cleared_quarter_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) {
                        q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
                                dbesc(datetime_convert('UTC','UTC',"now - 15 minutes")), intval(CACHE_QUARTER_HOUR));