X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fchanges%2FChangesFeed.php;h=7ac8cd0ed05d0acb3ed889d399a65da39d16a52d;hb=e1ceccda7242006d507f5d74ad2e29f94fb62e09;hp=cffb59a4a82cc370c1d5771c3ad21933927b6520;hpb=9e076d6b1a0af6411c005b24d5adb69345905735;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/changes/ChangesFeed.php b/includes/changes/ChangesFeed.php
index cffb59a4a8..7ac8cd0ed0 100644
--- a/includes/changes/ChangesFeed.php
+++ b/includes/changes/ChangesFeed.php
@@ -31,8 +31,6 @@ class ChangesFeed {
 	public $format, $type, $titleMsg, $descMsg;
 
 	/**
-	 * Constructor
-	 *
 	 * @param string $format Feed's format (either 'rss' or 'atom')
 	 * @param string $type Type of feed (for cache keys)
 	 */
@@ -84,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 );
 
@@ -167,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 );