From: mdew192837 <justin.d128@gmail.com>
Date: Thu, 25 May 2017 01:15:47 +0000 (-0500)
Subject: rebuildrecentchanges.php: Make purgeFeeds() use the correct cache
X-Git-Tag: 1.31.0-rc.0~3144^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=09a5d5edd81418308f4b383cb823c2b7e3d6ce6b;p=lhc%2Fweb%2Fwiklou.git

rebuildrecentchanges.php: Make purgeFeeds() use the correct cache

ChangesFeed was updated in 3517be1cf0b7, to use the WAN cache,
so this change updates the purgeFeeds() function to use that cache
too.

Avoid the deprected wfMemcKey() too.

Bug: T166195
Change-Id: I28a8d729737f03ccaf069495a59e80401c59e778
---

diff --git a/maintenance/rebuildrecentchanges.php b/maintenance/rebuildrecentchanges.php
index 458dacf56d..142a4e5f2f 100644
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -24,6 +24,7 @@
  */
 
 require_once __DIR__ . '/Maintenance.php';
+use MediaWiki\MediaWikiServices;
 
 /**
  * Maintenance script that rebuilds recent changes from scratch.
@@ -478,15 +479,16 @@ class RebuildRecentchanges extends Maintenance {
 	}
 
 	/**
-	 * Purge cached feeds in $messageMemc
+	 * Purge cached feeds in $wanCache
 	 */
 	private function purgeFeeds() {
-		global $wgFeedClasses, $messageMemc;
+		global $wgFeedClasses;
 
 		$this->output( "Deleting feed timestamps.\n" );
 
+		$wanCache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 		foreach ( $wgFeedClasses as $feed => $className ) {
-			$messageMemc->delete( wfMemcKey( 'rcfeed', $feed, 'timestamp' ) ); # Good enough for now.
+			$wanCache->delete( $wanCache->makeKey( 'rcfeed', $feed, 'timestamp' ) ); # Good enough for now.
 		}
 	}
 }