X-Git-Url: https://git.cyclocoop.org/admin/?a=blobdiff_plain;f=includes%2Fchanges%2FChangesFeed.php;h=7ac8cd0ed05d0acb3ed889d399a65da39d16a52d;hb=9604c55869b0879f944215eda992570820b55ec8;hp=99dc8991f2d7f58fff2d6078a4cfa0d4ab874951;hpb=85ac1b5d7c7ca50a93f2d16639cdde2f46bc133e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/changes/ChangesFeed.php b/includes/changes/ChangesFeed.php
index 99dc8991f2..7ac8cd0ed0 100644
--- a/includes/changes/ChangesFeed.php
+++ b/includes/changes/ChangesFeed.php
@@ -82,10 +82,11 @@ class ChangesFeed {
 			return null;
 		}
 
+		$cache = ObjectCache::getMainWANInstance();
 		$optionsHash = md5( serialize( $opts->getAllValues() ) ) . $wgRenderHashAppend;
-		$timekey = wfMemcKey(
+		$timekey = $cache->makeKey(
 			$this->type, $this->format, $wgLang->getCode(), $optionsHash, 'timestamp' );
-		$key = wfMemcKey( $this->type, $this->format, $wgLang->getCode(), $optionsHash );
+		$key = $cache->makeKey( $this->type, $this->format, $wgLang->getCode(), $optionsHash );
 
 		FeedUtils::checkPurge( $timekey, $key );
 
@@ -165,7 +166,7 @@ class ChangesFeed {
 	/**
 	 * Generate the feed items given a row from the database, printing the feed.
 	 * @param object $rows IDatabase resource with recentchanges rows
-	 * @param ChannelFeed $feed
+	 * @param ChannelFeed &$feed
 	 */
 	public static function generateFeed( $rows, &$feed ) {
 		$items = self::buildItems( $rows );