| Index: trunk/phase3/includes/PageHistory.php |
| — | — | @@ -501,7 +501,7 @@ |
| 502 | 502 | * @param string $type |
| 503 | 503 | */ |
| 504 | 504 | function feed( $type ) { |
| 505 | | - global $wgFeedClasses; |
| | 505 | + global $wgFeedClasses, $wgRequest, $wgFeedLimit; |
| 506 | 506 | if ( !FeedUtils::checkFeedOutput($type) ) { |
| 507 | 507 | return; |
| 508 | 508 | } |
| — | — | @@ -512,7 +512,14 @@ |
| 513 | 513 | wfMsgForContent( 'history-feed-description' ), |
| 514 | 514 | $this->mTitle->getFullUrl( 'action=history' ) ); |
| 515 | 515 | |
| 516 | | - $items = $this->fetchRevisions(10, 0, PageHistory::DIR_NEXT); |
| | 516 | + // Get a limit on number of feed entries. Provide a sane default |
| | 517 | + // of 10 if none is defined (but limit to $wgFeedLimit max) |
| | 518 | + $limit = $wgRequest->getInt( 'limit', 10 ); |
| | 519 | + if( $limit > $wgFeedLimit ) { |
| | 520 | + $limit = $wgFeedLimit; |
| | 521 | + } |
| | 522 | + $items = $this->fetchRevisions($limit, 0, PageHistory::DIR_NEXT); |
| | 523 | + |
| 517 | 524 | $feed->outHeader(); |
| 518 | 525 | if( $items ) { |
| 519 | 526 | foreach( $items as $row ) { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -432,6 +432,8 @@ |
| 433 | 433 | * (bug 14763) Child classes of Database (DatabasePostgres and DatabaseOracle) |
| 434 | 434 | had stict standards issues with setFakeSlaveLag() and setFakeMaster(). |
| 435 | 435 | * (bug 451) Improve the phrase mappings of the Chinese converter arrays. |
| | 436 | +* (bug 14778) 'limit' parameter now applies to history feeds as well as |
| | 437 | + history pages |
| 436 | 438 | |
| 437 | 439 | === API changes in 1.13 === |
| 438 | 440 | |