| Index: trunk/phase3/includes/specials/SpecialMovepage.php |
| — | — | @@ -490,6 +490,11 @@ |
| 491 | 491 | ); |
| 492 | 492 | $newLink = $skin->linkKnown( $newSubpage ); |
| 493 | 493 | $extraOutput []= wfMsgHtml( 'movepage-page-moved', $oldLink, $newLink ); |
| | 494 | + ++$count; |
| | 495 | + if( $count >= $wgMaximumMovedPages ) { |
| | 496 | + $extraOutput []= wfMsgExt( 'movepage-max-pages', array( 'parsemag', 'escape' ), $wgLang->formatNum( $wgMaximumMovedPages ) ); |
| | 497 | + break; |
| | 498 | + } |
| 494 | 499 | } else { |
| 495 | 500 | $oldLink = $skin->linkKnown( $oldSubpage ); |
| 496 | 501 | $newLink = $skin->link( $newSubpage ); |
| — | — | @@ -497,11 +502,6 @@ |
| 498 | 503 | } |
| 499 | 504 | } |
| 500 | 505 | |
| 501 | | - ++$count; |
| 502 | | - if( $count >= $wgMaximumMovedPages ) { |
| 503 | | - $extraOutput []= wfMsgExt( 'movepage-max-pages', array( 'parsemag', 'escape' ), $wgLang->formatNum( $wgMaximumMovedPages ) ); |
| 504 | | - break; |
| 505 | | - } |
| 506 | 506 | } |
| 507 | 507 | |
| 508 | 508 | if( $extraOutput !== array() ) { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -414,6 +414,7 @@ |
| 415 | 415 | * Fixed XSS vulnerability for Internet Explorer clients (only pre-release |
| 416 | 416 | versions of MediaWiki were affected). |
| 417 | 417 | * (bug 14817) Moving a page to a subpage of itself moves it twice |
| | 418 | +* (bug 20289) $wgMaximumMovedPages should only count pages actually moved |
| 418 | 419 | |
| 419 | 420 | == API changes in 1.16 == |
| 420 | 421 | |