X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2FSiteStats.php;h=df3e305c271407e2a16350cdfc46a448de1d5009;hb=1a81ba9bcb801de0be82fbd44332dada53800879;hp=ac5e49e70e5853c89d0d3cc3c5b6efc86c7277ac;hpb=bfb9b1ce8646180709c23d925ad2262514106289;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index ac5e49e70e..df3e305c27 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -189,12 +189,11 @@ class SiteStats {
 	 * @return int
 	 */
 	static function numberingroup( $group ) {
-		$cache = ObjectCache::getMainWANInstance();
+		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 		return $cache->getWithSetCallback(
-			wfMemcKey( 'SiteStats', 'groupcounts', $group ),
+			$cache->makeKey( 'SiteStats', 'groupcounts', $group ),
 			$cache::TTL_HOUR,
 			function ( $oldValue, &$ttl, array &$setOpts ) use ( $group ) {
-				global $wgDisableUserGroupExpiry;
 				$dbr = wfGetDB( DB_REPLICA );
 
 				$setOpts += Database::getCacheSetOptions( $dbr );
@@ -204,9 +203,7 @@ class SiteStats {
 					'COUNT(*)',
 					[
 						'ug_group' => $group,
-						$wgDisableUserGroupExpiry ?
-							'1' :
-							'ug_expiry IS NULL OR ug_expiry >= ' . $dbr->addQuotes( $dbr->timestamp() )
+						'ug_expiry IS NULL OR ug_expiry >= ' . $dbr->addQuotes( $dbr->timestamp() )
 					],
 					__METHOD__
 				);
@@ -225,13 +222,6 @@ class SiteStats {
 			} catch ( JobQueueError $e ) {
 				self::$jobs = 0;
 			}
-			/**
-			 * Zero rows still do single row read for row that doesn't exist,
-			 * but people are annoyed by that
-			 */
-			if ( self::$jobs == 1 ) {
-				self::$jobs = 0;
-			}
 		}
 		return self::$jobs;
 	}
@@ -299,7 +289,6 @@ class SiteStatsInit {
 	private $mUsers = null, $mFiles = null;
 
 	/**
-	 * Constructor
 	 * @param bool|IDatabase $database
 	 * - boolean: Whether to use the master DB
 	 * - IDatabase: Database connection to use