Merge pull request #3373 from strk/expire-login-later

[friendica.git] / include / cache.php

diff --git a/include/cache.php b/include/cache.php
index eee61dcd9e739af26f872fa3a28125a78bb1be8c..98799bcf40ff904c70c7b08910b72005b221be63 100644 (file)
--- a/include/cache.php
+++ b/include/cache.php
@@ -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;
                        }
                }
@@ -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));