X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Flibs%2Fobjectcache%2FHashBagOStuff.php;h=ec66492044b2539d8a90b6a33d9b88463ad8b564;hb=954b695a850309818c687d904775fe41972d4f36;hp=6d583da07c097f40f3653fbaa21dbdb0c034077c;hpb=19a84db108b86f8d4b94bde8e9c34add9f13cc31;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/libs/objectcache/HashBagOStuff.php b/includes/libs/objectcache/HashBagOStuff.php index 6d583da07c..ec66492044 100644 --- a/includes/libs/objectcache/HashBagOStuff.php +++ b/includes/libs/objectcache/HashBagOStuff.php @@ -44,7 +44,7 @@ class HashBagOStuff extends BagOStuff { function __construct( $params = [] ) { parent::__construct( $params ); - $this->maxCacheKeys = isset( $params['maxKeys'] ) ? $params['maxKeys'] : INF; + $this->maxCacheKeys = $params['maxKeys'] ?? INF; if ( $this->maxCacheKeys <= 0 ) { throw new InvalidArgumentException( '$maxKeys parameter must be above zero' ); } @@ -52,7 +52,7 @@ class HashBagOStuff extends BagOStuff { protected function expire( $key ) { $et = $this->bag[$key][self::KEY_EXP]; - if ( $et == self::TTL_INDEFINITE || $et > time() ) { + if ( $et == self::TTL_INDEFINITE || $et > $this->getCurrentTime() ) { return false; }