| Index: trunk/phase3/includes/LogEventsList.php |
| — | — | @@ -430,7 +430,7 @@ |
| 431 | 431 | // Show unmerge link |
| 432 | 432 | } else if( self::typeAction( $row, 'merge', 'merge', 'mergehistory' ) ) { |
| 433 | 433 | $revert = '(' . $this->skin->link( |
| 434 | | - SpecialPage::getTitleFor( 'Mergehistory' ), |
| | 434 | + SpecialPage::getTitleFor( 'MergeHistory' ), |
| 435 | 435 | $this->message['revertmerge'], |
| 436 | 436 | array(), |
| 437 | 437 | array( |
| Index: trunk/phase3/includes/specials/SpecialMergeHistory.php |
| — | — | @@ -47,21 +47,22 @@ |
| 48 | 48 | function preCacheMessages() { |
| 49 | 49 | // Precache various messages |
| 50 | 50 | if( !isset( $this->message ) ) { |
| 51 | | - $this->message['last'] = wfMsgExt( 'last', array( 'escape') ); |
| | 51 | + $this->message['last'] = wfMsgExt( 'last', array( 'escape' ) ); |
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | function execute( $par = '' ) { |
| 56 | 56 | global $wgOut, $wgRequest, $wgUser; |
| 57 | 57 | |
| 58 | | - if( !$wgUser->isAllowed( 'mergehistory' ) ) { |
| 59 | | - $wgOut->permissionRequired( 'mergehistory' ); |
| | 58 | + if( !$this->userCanExecute( $wgUser ) ) { |
| | 59 | + $this->displayRestrictionError(); |
| 60 | 60 | return; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | $this->loadRequestParams( $wgRequest ); |
| 64 | 64 | |
| 65 | | - $wgOut->setPagetitle( wfMsgHtml( "mergehistory" ) ); |
| | 65 | + $this->setHeaders(); |
| | 66 | + $this->outputHeader(); |
| 66 | 67 | |
| 67 | 68 | if( $this->mTargetID && $this->mDestID && $this->mAction=="submit" && $this->mMerge ) { |
| 68 | 69 | return $this->merge(); |