Merge "Revert "Adding sanity check to Title::isRedirect().""

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

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 27c5495..7fbe910 100644 (file)
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -76,20 +76,13 @@ class SpecialMergeHistory extends SpecialPage {
        function preCacheMessages() {
                // Precache various messages
                if( !isset( $this->message ) ) {
-                       $this->message['last'] = wfMsgExt( 'last', array( 'escape' ) );
+                       $this->message['last'] = $this->msg( 'last' )->escaped();
                }
        }
 
        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();
 
@@ -97,7 +90,8 @@ class SpecialMergeHistory extends SpecialPage {
                $this->outputHeader();
 
                if( $this->mTargetID && $this->mDestID && $this->mAction == 'submit' && $this->mMerge ) {
-                       return $this->merge();
+                       $this->merge();
+                       return;
                }
 
                if ( !$this->mSubmitted ) {
@@ -107,23 +101,23 @@ class SpecialMergeHistory extends SpecialPage {
 
                $errors = array();
                if ( !$this->mTargetObj instanceof Title ) {
-                       $errors[] = wfMsgExt( 'mergehistory-invalid-source', array( 'parse' ) );
+                       $errors[] = $this->msg( 'mergehistory-invalid-source' )->parseAsBlock();
                } elseif( !$this->mTargetObj->exists() ) {
-                       $errors[] = wfMsgExt( 'mergehistory-no-source', array( 'parse' ),
+                       $errors[] = $this->msg( 'mergehistory-no-source', array( 'parse' ),
                                wfEscapeWikiText( $this->mTargetObj->getPrefixedText() )
-                       );
+                       )->parseAsBlock();
                }
 
                if ( !$this->mDestObj instanceof Title ) {
-                       $errors[] = wfMsgExt( 'mergehistory-invalid-destination', array( 'parse' ) );
+                       $errors[] = $this->msg( 'mergehistory-invalid-destination' )->parseAsBlock();
                } elseif( !$this->mDestObj->exists() ) {
-                       $errors[] = wfMsgExt( 'mergehistory-no-destination', array( 'parse' ),
+                       $errors[] = $this->msg( 'mergehistory-no-destination', array( 'parse' ),
                                wfEscapeWikiText( $this->mDestObj->getPrefixedText() )
-                       );
+                       )->parseAsBlock();
                }
 
                if ( $this->mTargetObj && $this->mDestObj && $this->mTargetObj->equals( $this->mDestObj ) ) {
-                       $errors[] = wfMsgExt( 'mergehistory-same-destination', array( 'parse' ) );
+                       $errors[] = $this->msg( 'mergehistory-same-destination' )->parseAsBlock();
                }
 
                if ( count( $errors ) ) {
@@ -146,19 +140,19 @@ class SpecialMergeHistory extends SpecialPage {
                                'action' => $wgScript ) ) .
                        '<fieldset>' .
                        Xml::element( 'legend', array(),
-                               wfMsg( 'mergehistory-box' ) ) .
+                               $this->msg( 'mergehistory-box' )->text() ) .
                        Html::hidden( 'title', $this->getTitle()->getPrefixedDbKey() ) .
                        Html::hidden( 'submitted', '1' ) .
                        Html::hidden( 'mergepoint', $this->mTimestamp ) .
                        Xml::openElement( 'table' ) .
                        '<tr>
-                               <td>' . Xml::label( wfMsg( 'mergehistory-from' ), 'target' ) . '</td>
+                               <td>' . Xml::label( $this->msg( 'mergehistory-from' )->text(), 'target' ) . '</td>
                                <td>' . Xml::input( 'target', 30, $this->mTarget, array( 'id' => 'target' ) ) . '</td>
                        </tr><tr>
-                               <td>' . Xml::label( wfMsg( 'mergehistory-into' ), 'dest' ) . '</td>
+                               <td>' . Xml::label( $this->msg( 'mergehistory-into' )->text(), 'dest' ) . '</td>
                                <td>' . Xml::input( 'dest', 30, $this->mDest, array( 'id' => 'dest' ) ) . '</td>
                        </tr><tr><td>' .
-                       Xml::submitButton( wfMsg( 'mergehistory-go' ) ) .
+                       Xml::submitButton( $this->msg( 'mergehistory-go' )->text() ) .
                        '</td></tr>' .
                        Xml::closeElement( 'table' ) .
                        '</fieldset>' .
@@ -194,12 +188,12 @@ class SpecialMergeHistory extends SpecialPage {
                        # in a nice little table
                        $table =
                                Xml::openElement( 'fieldset' ) .
-                               wfMsgExt( 'mergehistory-merge', array( 'parseinline' ),
-                                       $this->mTargetObj->getPrefixedText(), $this->mDestObj->getPrefixedText() ) .
+                               $this->msg( 'mergehistory-merge', $this->mTargetObj->getPrefixedText(),
+                                       $this->mDestObj->getPrefixedText() )->parse() .
                                Xml::openElement( 'table', array( 'id' => 'mw-mergehistory-table' ) ) .
                                        '<tr>
                                                <td class="mw-label">' .
-                                                       Xml::label( wfMsg( 'mergehistory-reason' ), 'wpComment' ) .
+                                                       Xml::label( $this->msg( 'mergehistory-reason' )->text(), 'wpComment' ) .
                                                '</td>
                                                <td class="mw-input">' .
                                                        Xml::input( 'wpComment', 50, $this->mComment, array( 'id' => 'wpComment' ) ) .
@@ -208,7 +202,7 @@ class SpecialMergeHistory extends SpecialPage {
                                        <tr>
                                                <td>&#160;</td>
                                                <td class="mw-submit">' .
-                                                       Xml::submitButton( wfMsg( 'mergehistory-submit' ), array( 'name' => 'merge', 'id' => 'mw-merge-submit' ) ) .
+                                                       Xml::submitButton( $this->msg( 'mergehistory-submit' )->text(), array( 'name' => 'merge', 'id' => 'mw-merge-submit' ) ) .
                                                '</td>
                                        </tr>' .
                                Xml::closeElement( 'table' ) .
@@ -219,7 +213,7 @@ class SpecialMergeHistory extends SpecialPage {
 
                $out->addHTML(
                        '<h2 id="mw-mergehistory">' .
-                       wfMsgHtml( 'mergehistory-list' ) . "</h2>\n"
+                       $this->msg( 'mergehistory-list' )->escaped() . "</h2>\n"
                );
 
                if( $haveRevisions ) {
@@ -242,7 +236,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 );
 
@@ -260,7 +254,7 @@ class SpecialMergeHistory extends SpecialPage {
 
                $pageLink = Linker::linkKnown(
                        $rev->getTitle(),
-                       htmlspecialchars( $this->getLang()->timeanddate( $ts ) ),
+                       htmlspecialchars( $this->getLanguage()->timeanddate( $ts ) ),
                        array(),
                        array( 'oldid' => $rev->getId() )
                );
@@ -291,7 +285,10 @@ class SpecialMergeHistory extends SpecialPage {
                }
                $comment = Linker::revComment( $rev );
 
-               return "<li>$checkBox ($last) $pageLink . . $userLink $stxt $comment</li>";
+               $revisionRow = $this->msg( 'mergehistory-revisionrow' )->rawParams( $checkBox, $last, $pageLink, $userLink, $stxt, $comment)->escaped();
+               $revisionRow .= "<li>" . $line . "</li>";
+
+               return $revisionRow;
        }
 
        function merge() {
@@ -303,7 +300,7 @@ class SpecialMergeHistory extends SpecialPage {
                if( is_null( $targetTitle ) || is_null( $destTitle ) ) {
                        return false; // validate these
                }
-               if( $targetTitle->getArticleId() == $destTitle->getArticleId() ) {
+               if( $targetTitle->getArticleID() == $destTitle->getArticleID() ) {
                        return false;
                }
                # Verify that this timestamp is valid
@@ -362,28 +359,28 @@ class SpecialMergeHistory extends SpecialPage {
                );
                if( !$haveRevisions ) {
                        if( $this->mComment ) {
-                               $comment = wfMsgForContent(
+                               $comment = $this->msg(
                                        'mergehistory-comment',
                                        $targetTitle->getPrefixedText(),
                                        $destTitle->getPrefixedText(),
                                        $this->mComment
-                               );
+                               )->inContentLanguage()->text();
                        } else {
-                               $comment = wfMsgForContent(
+                               $comment = $this->msg(
                                        'mergehistory-autocomment',
                                        $targetTitle->getPrefixedText(),
                                        $destTitle->getPrefixedText()
-                               );
+                               )->inContentLanguage()->text();
                        }
                        $mwRedir = MagicWord::get( 'redirect' );
                        $redirectText = $mwRedir->getSynonym( 0 ) . ' [[' . $destTitle->getPrefixedText() . "]]\n";
-                       $redirectArticle = new Article( $targetTitle );
+                       $redirectPage = WikiPage::factory( $targetTitle );
                        $redirectRevision = new Revision( array(
                                'page'    => $this->mTargetID,
                                'comment' => $comment,
                                'text'    => $redirectText ) );
                        $redirectRevision->insertOn( $dbw );
-                       $redirectArticle->updateRevisionOn( $dbw, $redirectRevision );
+                       $redirectPage->updateRevisionOn( $dbw, $redirectRevision );
 
                        # Now, we record the link from the redirect to the new title.
                        # It should have no other outgoing links...
@@ -411,9 +408,8 @@ class SpecialMergeHistory extends SpecialPage {
                        array( $destTitle->getPrefixedText(), $timestampLimit )
                );
 
-               $this->getOutput()->addHTML(
-                       wfMsgExt( 'mergehistory-success', array('parseinline'),
-                       $targetTitle->getPrefixedText(), $destTitle->getPrefixedText(), $count ) );
+               $this->getOutput()->addWikiMsg( 'mergehistory-success',
+                       $targetTitle->getPrefixedText(), $destTitle->getPrefixedText(), $count );
 
                wfRunHooks( 'ArticleMergeComplete', array( $targetTitle, $destTitle ) );
 
@@ -483,8 +479,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() )
                );
        }