Merge "objectcache: make adaptiveTTL() use getCurrentTime() for completeness"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 27 Nov 2017 19:46:44 +0000 (19:46 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 27 Nov 2017 19:46:44 +0000 (19:46 +0000)
includes/libs/objectcache/WANObjectCache.php

index f5c561f..ae7f36c 100644 (file)
@@ -1558,7 +1558,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
                        return $minTTL; // no last-modified time provided
                }
 
-               $age = time() - $mtime;
+               $age = $this->getCurrentTime() - $mtime;
 
                return (int)min( $maxTTL, max( $minTTL, $factor * $age ) );
        }