Follow-up to r60163 - add new function parameters at the end of the parameter list...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e1502f9..65a0d14 100644 (file)
--- 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 54fb556..9ff2724 100644 (file)
--- 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 1642132..2de734f 100644 (file)
--- 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 );
                }