* Follow-up r63914: SpecialPage has methods for that, use them ;)

* Fix a case mismatch in LogEventsList.php

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 37502f4..49d4dc5 100644 (file)
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -430,7 +430,7 @@ class LogEventsList {
                // Show unmerge link
                } else if( self::typeAction( $row, 'merge', 'merge', 'mergehistory' ) ) {
                        $revert = '(' . $this->skin->link(
-                               SpecialPage::getTitleFor( 'Mergehistory' ),
+                               SpecialPage::getTitleFor( 'MergeHistory' ),
                                $this->message['revertmerge'],
                                array(),
                                array(

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index e2ed38c..6d2ea3b 100644 (file)
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -47,21 +47,22 @@ class SpecialMergeHistory extends SpecialPage {
        function preCacheMessages() {
                // Precache various messages
                if( !isset( $this->message ) ) {
-                       $this->message['last'] = wfMsgExt( 'last', array( 'escape') );
+                       $this->message['last'] = wfMsgExt( 'last', array( 'escape' ) );
                }
        }
 
        function execute( $par = '' ) {
                global $wgOut, $wgRequest, $wgUser;
 
-               if( !$wgUser->isAllowed( 'mergehistory' ) ) {
-                       $wgOut->permissionRequired( 'mergehistory' );
+               if( !$this->userCanExecute( $wgUser ) ) {
+                       $this->displayRestrictionError();
                        return;
                }
 
                $this->loadRequestParams( $wgRequest );
 
-               $wgOut->setPagetitle( wfMsgHtml( "mergehistory" ) );
+               $this->setHeaders();
+               $this->outputHeader();
 
                if( $this->mTargetID && $this->mDestID && $this->mAction=="submit" && $this->mMerge ) {
                        return $this->merge();