Followup r80122, protected, just incase it's needed..

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

diff --git a/includes/specials/SpecialRevisionMove.php b/includes/specials/SpecialRevisionMove.php
index b3b7d6c..7e5e828 100644 (file)
--- a/includes/specials/SpecialRevisionMove.php
+++ b/includes/specials/SpecialRevisionMove.php
@@ -149,11 +149,11 @@ class SpecialRevisionMove extends UnlistedSpecialPage {
                                'action' => $this->getTitle()->getLocalUrl( array( 'action' => 'submit' ) ),
                                'id' => 'mw-revmove-form' ) ) .
                        Xml::fieldset( wfMsg( 'revmove-legend' ) ) .
-                       Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
-                       Xml::hidden( 'oldTitle', $this->mOldTitle->getPrefixedText() ) .
+                       Html::hidden( 'wpEditToken', $wgUser->editToken() ) .
+                       Html::hidden( 'oldTitle', $this->mOldTitle->getPrefixedText() ) .
                        '<div>' . Xml::inputLabel( wfMsg( 'revmove-reasonfield' ), 'wpReason', 'revmove-reasonfield', 60 ) . '</div>' .
                        Xml::inputLabel( wfMsg( 'revmove-titlefield' ), 'newTitle', 'revmove-titlefield', 20, $this->mOldTitle->getPrefixedText() ) .
-                       Xml::hidden( 'ids', implode( ',', $this->mIds ) ) .
+                       Html::hidden( 'ids', implode( ',', $this->mIds ) ) .
                        Xml::submitButton( wfMsg( 'revmove-submit' ),
                                                        array( 'name' => 'wpSubmit' ) ) .
                        Xml::closeElement( 'fieldset' ) . "\n" .
@@ -301,7 +301,6 @@ class SpecialRevisionMove extends UnlistedSpecialPage {
                                array( 'page_id = ' . $this->mOldTitle->getArticleID() ),
                                __METHOD__
                        );
-                       $deletedOldPage = true;
                } else {
                        # page_latest has to be updated
                        $currentOldPageRev = Revision::newFromId( $this->mOldTitle->getLatestRevID() );
@@ -341,7 +340,7 @@ class SpecialRevisionMove extends UnlistedSpecialPage {
        protected function queryLatestTimestamp( &$dbw, $articleId, $conds = array() ) {
                $timestampNewRow = $dbw->selectRow(
                        'revision',
-                       'max(rev_timestamp) as maxtime',
+                       'max(rev_timestamp) AS maxtime',
                        array_merge( array( 'rev_page' => $articleId ), $conds ),
                        __METHOD__
                );