Following r100264, update usages in core

[lhc/web/wiklou.git] / includes / specials / SpecialMergeHistory.php

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index f201a71..b4b5f10 100644 (file)
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -81,15 +81,8 @@ class SpecialMergeHistory extends SpecialPage {
        }
 
        public function execute( $par ) {
-               $user = $this->getUser();
-               if( !$this->userCanExecute( $user ) ) {
-                       $this->displayRestrictionError();
-                       return;
-               }
-
-               if ( wfReadOnly() ) {
-                       throw new ReadOnlyError;
-               }
+               $this->checkPermissions();
+               $this->checkReadOnly();
 
                $this->loadRequestParams();
 
@@ -167,9 +160,6 @@ class SpecialMergeHistory extends SpecialPage {
        }
 
        private function showHistory() {
-               $out = $this->getOutput();
-               $out->setPageTitle( wfMsg( 'mergehistory' ) );
-
                $this->showMergeForm();
 
                # List all stored revisions
@@ -178,6 +168,7 @@ class SpecialMergeHistory extends SpecialPage {
                );
                $haveRevisions = $revisions && $revisions->getNumRows() > 0;
 
+               $out = $this->getOutput();
                $titleObj = $this->getTitle();
                $action = $titleObj->getLocalURL( array( 'action' => 'submit' ) );
                # Start the form here
@@ -244,7 +235,7 @@ class SpecialMergeHistory extends SpecialPage {
                $misc .= Html::hidden( 'destID', $this->mDestObj->getArticleID() );
                $misc .= Html::hidden( 'target', $this->mTarget );
                $misc .= Html::hidden( 'dest', $this->mDest );
-               $misc .= Html::hidden( 'wpEditToken', $this->getUser()->editToken() );
+               $misc .= Html::hidden( 'wpEditToken', $this->getUser()->getEditToken() );
                $misc .= Xml::closeElement( 'form' );
                $out->addHTML( $misc );
 
@@ -485,8 +476,8 @@ class MergeHistoryPager extends ReverseChronologicalPager {
                        'fields' => array_merge( Revision::selectFields(), Revision::selectUserFields() ),
                        'conds'  => $conds,
                        'join_conds' => array(
-                               'page' => array( 'INNER JOIN', 'rev_page = page_id' ),
-                               'user' => array( 'LEFT JOIN', 'user_id = rev_user' ) )
+                               'page' => Revision::pageJoinCond(),
+                               'user' => Revision::userJoinCond() )
                );
        }