| Index: trunk/phase3/CREDITS |
| — | — | @@ -72,6 +72,7 @@ |
| 73 | 73 | * Brent G |
| 74 | 74 | * Brianna Laugher |
| 75 | 75 | * Carlin |
| | 76 | +* Crb |
| 76 | 77 | * Dan Nessett |
| 77 | 78 | * Daniel Arnold |
| 78 | 79 | * Denny Vrandecic |
| Index: trunk/phase3/includes/ChangesFeed.php |
| — | — | @@ -18,7 +18,7 @@ |
| 19 | 19 | $feedTitle, htmlspecialchars( $description ), $wgTitle->getFullUrl() ); |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | | - public function execute( $feed, $rows, $limit=0, $hideminor=false, $lastmod=false, $target='' ) { |
| | 22 | + public function execute( $feed, $rows, $limit=0, $hideminor=false, $namespace='', $lastmod=false, $target='' ) { |
| 23 | 23 | global $messageMemc, $wgFeedCacheTimeout; |
| 24 | 24 | global $wgSitename, $wgLang; |
| 25 | 25 | |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | $timekey = wfMemcKey( $this->type, $this->format, 'timestamp' ); |
| 31 | | - $key = wfMemcKey( $this->type, $this->format, $limit, $hideminor, $target, $wgLang->getCode() ); |
| | 31 | + $key = wfMemcKey( $this->type, $this->format, $limit, $hideminor, $namespace, $target, $wgLang->getCode() ); |
| 32 | 32 | |
| 33 | 33 | FeedUtils::checkPurge($timekey, $key); |
| 34 | 34 | |
| Index: trunk/phase3/includes/specials/SpecialRecentchanges.php |
| — | — | @@ -67,8 +67,8 @@ |
| 68 | 68 | public function feedSetup() { |
| 69 | 69 | global $wgFeedLimit, $wgRequest; |
| 70 | 70 | $opts = $this->getDefaultOptions(); |
| 71 | | - # Feed is cached on limit,hideminor; other params would randomly not work |
| 72 | | - $opts->fetchValuesFromRequest( $wgRequest, array( 'limit', 'hideminor' ) ); |
| | 71 | + # Feed is cached on limit,hideminor,namespace; other params would randomly not work |
| | 72 | + $opts->fetchValuesFromRequest( $wgRequest, array( 'limit', 'hideminor', 'namespace' ) ); |
| 73 | 73 | $opts->validateIntBounds( 'limit', 0, $wgFeedLimit ); |
| 74 | 74 | return $opts; |
| 75 | 75 | } |
| — | — | @@ -117,7 +117,7 @@ |
| 118 | 118 | $target = isset($opts['target']) ? $opts['target'] : ''; // RCL has targets |
| 119 | 119 | if( $feedFormat ) { |
| 120 | 120 | list( $feed, $feedObj ) = $this->getFeedObject( $feedFormat ); |
| 121 | | - $feed->execute( $feedObj, $rows, $opts['limit'], $opts['hideminor'], $lastmod, $target ); |
| | 121 | + $feed->execute( $feedObj, $rows, $opts['limit'], $opts['hideminor'], $opts['namespace'], $lastmod, $target ); |
| 122 | 122 | } else { |
| 123 | 123 | $this->webOutput( $rows, $opts ); |
| 124 | 124 | } |