From 1769c444f2d0f7d8e4f7a96f86a68475d2d7fcf5 Mon Sep 17 00:00:00 2001 From: Happy-melon Date: Thu, 17 Dec 2009 20:28:57 +0000 Subject: [PATCH] Follow-up to r60163 - add new function parameters at the end of the parameter list. And update release notes. --- RELEASE-NOTES | 2 ++ includes/ChangesFeed.php | 4 ++-- includes/specials/SpecialRecentchanges.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index e1502f9801..65a0d14e38 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -685,6 +685,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 21814) Message shown when rolling back an edit with a deleted username now shows '(username deleted)' instead of broken user tool links * (bug 21536) Fixed JavaScript error on Special:Search caused by an incorrect ID +* (bug 21535) RecentChanges RSS feed now always recognises the namespace filter, + previously it sometimes didn't due to caching. == API changes in 1.16 == diff --git a/includes/ChangesFeed.php b/includes/ChangesFeed.php index 54fb556001..9ff2724153 100644 --- a/includes/ChangesFeed.php +++ b/includes/ChangesFeed.php @@ -18,7 +18,7 @@ class ChangesFeed { $feedTitle, htmlspecialchars( $description ), $wgTitle->getFullUrl() ); } - public function execute( $feed, $rows, $limit=0, $hideminor=false, $namespace='', $lastmod=false, $target='' ) { + public function execute( $feed, $rows, $limit=0, $hideminor=false, $lastmod=false, $target='', $namespace='' ) { global $messageMemc, $wgFeedCacheTimeout; global $wgSitename, $wgLang; @@ -27,7 +27,7 @@ class ChangesFeed { } $timekey = wfMemcKey( $this->type, $this->format, 'timestamp' ); - $key = wfMemcKey( $this->type, $this->format, $limit, $hideminor, $namespace, $target, $wgLang->getCode() ); + $key = wfMemcKey( $this->type, $this->format, $limit, $hideminor, $target, $wgLang->getCode(), $namespace ); FeedUtils::checkPurge($timekey, $key); diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 1642132618..2de734f81e 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -117,7 +117,7 @@ class SpecialRecentChanges extends SpecialPage { $target = isset($opts['target']) ? $opts['target'] : ''; // RCL has targets if( $feedFormat ) { list( $feed, $feedObj ) = $this->getFeedObject( $feedFormat ); - $feed->execute( $feedObj, $rows, $opts['limit'], $opts['hideminor'], $opts['namespace'], $lastmod, $target ); + $feed->execute( $feedObj, $rows, $opts['limit'], $opts['hideminor'], $lastmod, $target, $opts['namespace'] ); } else { $this->webOutput( $rows, $opts ); } -- 2.20.1