From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 27 Nov 2017 17:45:46 +0000 (-0800)
Subject: objectcache: make adaptiveTTL() use getCurrentTime() for completeness
X-Git-Tag: 1.31.0-rc.0~1401^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22brouteur%22%2C%28%24id_rubrique%20?a=commitdiff_plain;h=b633233c04502f4d21c77312d1e04e1dae1617f0;p=lhc%2Fweb%2Fwiklou.git

objectcache: make adaptiveTTL() use getCurrentTime() for completeness

Change-Id: I5ba3c39ccaf412b0aaecd64d52ab15b2075bc76c
---

diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php
index f5c561f504..ae7f36cefe 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -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 ) );
 	}