Merge pull request #3463 from friendica/develop

[friendica.git] / include / cache.php

diff --git a/include/cache.php b/include/cache.php
index eee61dcd9e739af26f872fa3a28125a78bb1be8c..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 {
        /**
@@ -87,10 +87,10 @@ class Cache {
                        $cached = $memcache->get(get_app()->get_hostname().":".$key);
                        $value = @unserialize($cached);
 
-                       // Only return a value if the serialized value is valid and
+                       // 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 === 'b:0;' || $value !== false) {
+                       // boolean 'false' value (which we want to return).
+                       if ($cached === serialize(false) || $value !== false) {
                                return $value;
                        }
 
@@ -108,10 +108,10 @@ class Cache {
                        $cached = $r[0]['v'];
                        $value = @unserialize($cached);
 
-                       // Only return a value if the serialized value is valid and
+                       // 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 === 'b:0;' || $value !== false) {
+                       // boolean 'false' value (which we want to return).
+                       if ($cached === serialize(false) || $value !== false) {
                                return $value;
                        }
                }
@@ -121,9 +121,9 @@ 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
@@ -186,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));