* (bug 12938) Fix template expansion and 404 returns for action=raw with section
[lhc/web/wiklou.git] / includes / SpecialMergeHistory.php
index 5e11eb9..3e57cce 100644 (file)
-<?php\r
-\r
-/**\r
- * Special page allowing users with the appropriate permissions to \r
- * merge article histories, with some restrictions\r
- *\r
- * @addtogroup SpecialPage\r
- */\r
-\r
-/**\r
- * Constructor\r
- */\r
-function wfSpecialMergehistory( $par ) {\r
-       global $wgRequest;\r
-\r
-       $form = new MergehistoryForm( $wgRequest, $par );\r
-       $form->execute();\r
-}\r
-\r
-/**\r
- * The HTML form for Special:MergeHistory, which allows users with the appropriate\r
- * permissions to view and restore deleted content.\r
- * @addtogroup SpecialPage\r
- */\r
-class MergehistoryForm {\r
-       var $mAction, $mTarget, $mDest, $mTimestamp, $mTargetID, $mDestID, $mComment;\r
-       var $mTargetObj, $mDestObj;\r
-\r
-       function MergehistoryForm( $request, $par = "" ) {\r
-               global $wgUser;\r
-               \r
-               $this->mAction = $request->getVal( 'action' );\r
-               $this->mTarget = $request->getVal( 'target' );\r
-               $this->mDest = $request->getVal( 'dest' );\r
-               \r
-               $this->mTargetID = intval( $request->getVal( 'targetID' ) );\r
-               $this->mDestID = intval( $request->getVal( 'destID' ) );\r
-               $this->mTimestamp = $request->getVal( 'mergepoint' );\r
-               $this->mComment = $request->getText( 'wpComment' );\r
-               \r
-               $this->mMerge = $request->wasPosted() && $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );\r
-               // target page\r
-               if( $this->mTarget !== "" ) {\r
-                       $this->mTargetObj = Title::newFromURL( $this->mTarget );\r
-               } else {\r
-                       $this->mTargetObj = NULL;\r
-               }\r
-               # Destination\r
-               if( $this->mDest !== "" ) {\r
-                       $this->mDestObj = Title::newFromURL( $this->mDest );\r
-               } else {\r
-                       $this->mDestObj = NULL;\r
-               }               \r
-               \r
-               $this->preCacheMessages();\r
-       }\r
-       \r
-       /**\r
-        * As we use the same small set of messages in various methods and that\r
-        * they are called often, we call them once and save them in $this->message\r
-        */\r
-       function preCacheMessages() {\r
-               // Precache various messages\r
-               if( !isset( $this->message ) ) {\r
-                       $this->message['last'] = wfMsgExt( 'last', array( 'escape') );\r
-               }\r
-       }\r
-\r
-       function execute() {\r
-               global $wgOut, $wgUser;\r
-               \r
-               $wgOut->setPagetitle( wfMsgHtml( "mergehistory" ) );\r
-               \r
-               if( $this->mTargetID && $this->mDestID && $this->mAction=="submit" && $this->mMerge ) {\r
-                       return $this->merge();\r
-               }\r
-               \r
-               if( is_object($this->mTargetObj) && is_object($this->mDestObj) ) {\r
-                       return $this->showHistory();\r
-               }\r
-               \r
-               return $this->showMergeForm();\r
-       }\r
-\r
-       function showMergeForm() {\r
-               global $wgOut, $wgScript;\r
-               \r
-               $wgOut->addWikiText( wfMsg( 'mergehistory-header' ) );\r
-               \r
-               $wgOut->addHtml(\r
-                       Xml::openElement( 'form', array(\r
-                               'method' => 'get',\r
-                               'action' => $wgScript ) ) .\r
-                       '<fieldset>' .\r
-                       Xml::element( 'legend', array(),\r
-                               wfMsg( 'mergehistory-box' ) ) .\r
-                       Xml::hidden( 'title',\r
-                               SpecialPage::getTitleFor( 'Mergehistory' )->getPrefixedDbKey() ) .\r
-                       Xml::openElement( 'table' ) .\r
-                       "<tr>\r
-                               <td>".Xml::Label( wfMsg( 'mergehistory-from' ), 'target' )."</td>\r
-                               <td>".Xml::input( 'target', 30, $this->mTarget, array('id'=>'target') )."</td>\r
-                       </tr><tr>\r
-                               <td>".Xml::Label( wfMsg( 'mergehistory-into' ), 'dest' )."</td>\r
-                               <td>".Xml::input( 'dest', 30, $this->mDest, array('id'=>'dest') )."</td>\r
-                       </tr><tr><td>" .\r
-                       Xml::submitButton( wfMsg( 'mergehistory-go' ) ) .\r
-                       "</td></tr>" .\r
-                       Xml::closeElement( 'table' ) .\r
-                       '</fieldset>' .\r
-                       '</form>' );\r
-       }\r
-\r
-       private function showHistory() {\r
-               global $wgLang, $wgContLang, $wgUser, $wgOut;\r
-\r
-               $this->sk = $wgUser->getSkin();\r
-               \r
-               $wgOut->setPagetitle( wfMsg( "mergehistory" ) );\r
-               \r
-               $this->showMergeForm();\r
-               \r
-               # List all stored revisions\r
-               $revisions = new MergeHistoryPager( $this, array(), $this->mTargetObj, $this->mDestObj );\r
-               $haveRevisions = $revisions && $revisions->getNumRows() > 0;\r
-\r
-               $titleObj = SpecialPage::getTitleFor( "Mergehistory" );\r
-               $action = $titleObj->getLocalURL( "action=submit" );\r
-               # Start the form here\r
-               $top = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'merge' ) );\r
-               $wgOut->addHtml( $top );\r
-\r
-               if( $haveRevisions ) {\r
-                       # Format the user-visible controls (comment field, submission button)\r
-                       # in a nice little table\r
-                       $align = $wgContLang->isRtl() ? 'left' : 'right';\r
-                       $table =\r
-                               Xml::openElement( 'fieldset' ) .\r
-                               Xml::openElement( 'table' ) .\r
-                                       "<tr>\r
-                                               <td colspan='2'>" .\r
-                                                       wfMsgExt( 'mergehistory-merge', array('parseinline'),\r
-                                                               $this->mTargetObj->getPrefixedText(), $this->mDestObj->getPrefixedText() ) .\r
-                                               "</td>\r
-                                       </tr>\r
-                                       <tr>\r
-                                               <td align='$align'>" .\r
-                                                       Xml::label( wfMsg( 'undeletecomment' ), 'wpComment' ) .\r
-                                               "</td>\r
-                                               <td>" .\r
-                                                       Xml::input( 'wpComment', 50, $this->mComment ) .\r
-                                               "</td>\r
-                                       </tr>\r
-                                       <tr>\r
-                                               <td>&nbsp;</td>\r
-                                               <td>" .\r
-                                                       Xml::submitButton( wfMsg( 'mergehistory-submit' ), array( 'name' => 'merge', 'id' => 'mw-merge-submit' ) ) .\r
-                                               "</td>\r
-                                       </tr>" .\r
-                               Xml::closeElement( 'table' ) .\r
-                               Xml::closeElement( 'fieldset' );\r
-\r
-                       $wgOut->addHtml( $table );\r
-               }\r
-\r
-               $wgOut->addHTML( "<h2 id=\"mergehistory\">" . wfMsgHtml( "mergehistory-list" ) . "</h2>\n" );\r
-\r
-               if( $haveRevisions ) {\r
-                       $wgOut->addHTML( $revisions->getNavigationBar() );\r
-                       $wgOut->addHTML( "<ul>" );\r
-                       $wgOut->addHTML( $revisions->getBody() );\r
-                       $wgOut->addHTML( "</ul>" );\r
-                       $wgOut->addHTML( $revisions->getNavigationBar() );\r
-               } else {\r
-                       $wgOut->addWikiText( wfMsg( "mergehistory-empty" ) );\r
-               }\r
-\r
-               # Show relevant lines from the deletion log:\r
-               $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'merge' ) ) . "</h2>\n" );\r
-               $logViewer = new LogViewer(\r
-                       new LogReader(\r
-                               new FauxRequest(\r
-                                       array( 'page' => $this->mTargetObj->getPrefixedText(),\r
-                                                  'type' => 'merge' ) ) ) );\r
-               $logViewer->showList( $wgOut );\r
-               \r
-               # Slip in the hidden controls here\r
-               # When we submit, go by page ID to avoid some nasty but unlikely collisions.\r
-               # Such would happen if a page was renamed after the form loaded, but before submit\r
-               $misc = Xml::hidden( 'targetID', $this->mTargetObj->getArticleID() );\r
-               $misc .= Xml::hidden( 'destID', $this->mDestObj->getArticleID() );\r
-               $misc .= Xml::hidden( 'target', $this->mTarget );\r
-               $misc .= Xml::hidden( 'dest', $this->mDest );\r
-               $misc .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );\r
-               $misc .= Xml::closeElement( 'form' );\r
-               $wgOut->addHtml( $misc );\r
-\r
-               return true;\r
-       }\r
-       \r
-       function formatRevisionRow( $row ) {\r
-               global $wgUser, $wgLang;\r
-               \r
-               $rev = new Revision( $row );\r
-               \r
-               $stxt = ''; \r
-               $last = $this->message['last'];\r
-               \r
-               $ts = wfTimestamp( TS_MW, $row->rev_timestamp );\r
-               $checkBox = wfRadio( "mergepoint", $ts, false );\r
-               \r
-               $pageLink = $this->sk->makeKnownLinkObj( $rev->getTitle(), $wgLang->timeanddate( $ts ), 'oldid=' . $rev->getID() );\r
-               if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {\r
-                       $pageLink = '<span class="history-deleted">' . $pageLink . '</span>';\r
-               }\r
-               \r
-               # Last link\r
-               if( !$rev->userCan( Revision::DELETED_TEXT ) )\r
-                       $last = $this->message['last'];\r
-               else if( isset($this->prevId[$row->rev_id]) )\r
-                       $last = $this->sk->makeKnownLinkObj( $rev->getTitle(), $this->message['last'], \r
-                               "&diff=" . $row->rev_id . "&oldid=" . $this->prevId[$row->rev_id] );\r
-               \r
-               $userLink = $this->sk->userLink( $rev->getUser(), $rev->getUserText() )\r
-                       . $this->sk->userToolLinks( $rev->getUser(), $rev->getUserText() );\r
-               \r
-               if(!is_null($size = $row->rev_len)) {\r
-                       if($size == 0)\r
-                               $stxt = wfMsgHtml('historyempty');\r
-                       else\r
-                               $stxt = wfMsgHtml('historysize', $wgLang->formatNum( $size ) );\r
-               }\r
-               $comment = $this->sk->revComment( $rev );\r
-               \r
-               return "<li>$checkBox ($last) $pageLink . . $userLink $stxt $comment</li>";\r
-       }\r
-\r
-       /**\r
-        * Fetch revision text link if it's available to all users\r
-        * @return string\r
-        */\r
-       function getPageLink( $row, $titleObj, $ts, $target ) {\r
-               global $wgLang;\r
-               \r
-               if( !$this->userCan($row, Revision::DELETED_TEXT) ) {\r
-                       return '<span class="history-deleted">' . $wgLang->timeanddate( $ts, true ) . '</span>';\r
-               } else {\r
-                       $link = $this->sk->makeKnownLinkObj( $titleObj, $wgLang->timeanddate( $ts, true ), "target=$target&timestamp=$ts" );\r
-                       if( $this->isDeleted($row, Revision::DELETED_TEXT) )\r
-                               $link = '<span class="history-deleted">' . $link . '</span>';\r
-                       return $link;\r
-               }\r
-       }\r
-\r
-       /**\r
-        * Fetch revision's user id if it's available to this user\r
-        * @return string\r
-        */\r
-       function getUser( $row ) {      \r
-               if( !$this->userCan($row, Revision::DELETED_USER) ) {\r
-                       return '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';\r
-               } else {\r
-                       $link = $this->sk->userLink( $row->rev_user, $row->rev_user_text ) . $this->sk->userToolLinks( $row->rev_user, $row->rev_user_text );\r
-                       if( $this->isDeleted($row, Revision::DELETED_USER) )\r
-                               $link = '<span class="history-deleted">' . $link . '</span>';\r
-                       return $link;\r
-               }\r
-       }\r
-\r
-       /**\r
-        * Fetch revision comment if it's available to this user\r
-        * @return string\r
-        */\r
-       function getComment( $row ) {\r
-               if( !$this->userCan($row, Revision::DELETED_COMMENT) ) {\r
-                       return '<span class="history-deleted"><span class="comment">' . wfMsgHtml( 'rev-deleted-comment' ) . '</span></span>';\r
-               } else {\r
-                       $link = $this->sk->commentBlock( $row->rev_comment );\r
-                       if( $this->isDeleted($row, Revision::DELETED_COMMENT) )\r
-                               $link = '<span class="history-deleted">' . $link . '</span>';\r
-                       return $link;\r
-               }\r
-       }\r
-\r
-       function merge() {\r
-               global $wgOut, $wgUser;\r
-               # Get the titles directly from the IDs, in case the target page params \r
-               # were spoofed. The queries are done based on the IDs, so it's best to \r
-               # keep it consistent...\r
-               $targetTitle = Title::newFromID( $this->mTargetID );\r
-               $destTitle = Title::newFromID( $this->mDestID );\r
-               if( is_null($targetTitle) || is_null($destTitle) )\r
-                       return false; // validate these\r
-               # Verify that this timestamp is valid\r
-               # Must be older than the destination page\r
-               $dbw = wfGetDB( DB_MASTER );\r
-               $maxtimestamp = $dbw->selectField( 'revision', 'MIN(rev_timestamp)',\r
-                       array('rev_page' => $this->mDestID ),\r
-                       __METHOD__ );\r
-               # Destination page must exist with revisions\r
-               if( !$maxtimestamp ) {\r
-                       $wgOut->addHtml( wfMsg('mergehistory-fail') );\r
-                       return false;\r
-               }\r
-               # Leave the latest version no matter what\r
-               $lasttime = $dbw->selectField( array('page','revision'), \r
-                       'rev_timestamp',\r
-                       array('page_id' => $this->mTargetID, 'page_latest = rev_id' ),\r
-                       __METHOD__ );\r
-               # Take the most restrictive of the twain\r
-               $maxtimestamp = ($lasttime < $maxtimestamp) ? $lasttime : $maxtimestamp;\r
-               if( $this->mTimestamp && $this->mTimestamp >= $maxtimestamp ) {\r
-                       $wgOut->addHtml( wfMsg('mergehistory-fail') );\r
-                       return false;\r
-               }\r
-               # Update the revisions\r
-               if( $this->mTimestamp )\r
-                       $timewhere = "rev_timestamp <= {$this->mTimestamp}";\r
-               else\r
-                       $timewhere = '1 = 1';\r
-               \r
-               $dbw->update( 'revision',\r
-                       array( 'rev_page' => $this->mDestID ),\r
-                       array( 'rev_page' => $this->mTargetID, \r
-                               "rev_timestamp < {$maxtimestamp}",\r
-                               $timewhere ),\r
-                       __METHOD__ );\r
-               # Check if this did anything\r
-               $count = $dbw->affectedRows();\r
-               if( !$count ) {\r
-                       $wgOut->addHtml( wfMsg('mergehistory-fail') );\r
-                       return false;\r
-               }\r
-               # Update our logs\r
-               $log = new LogPage( 'merge' );\r
-               $log->addEntry( 'merge', $targetTitle, $this->mComment, \r
-                       array($destTitle->getPrefixedText(),$this->mTimestamp) );\r
-               \r
-               $wgOut->addHtml( wfMsgExt( 'mergehistory-success', array('parseinline'),\r
-                       $targetTitle->getPrefixedText(), $destTitle->getPrefixedText(), $count ) );\r
-               \r
-               wfRunHooks( 'ArticleMergeComplete', array( $targetTitle, $destTitle ) );\r
-               \r
-               return true;\r
-       }\r
-}\r
-\r
-class MergeHistoryPager extends ReverseChronologicalPager {\r
-       public $mForm, $mConds;\r
-\r
-       function __construct( $form, $conds = array(), $title, $title2 ) {\r
-               $this->mForm = $form;\r
-               $this->mConds = $conds;\r
-               $this->title = $title;\r
-               $this->articleID = $title->getArticleID();\r
-               \r
-               $dbw = wfGetDB( DB_SLAVE );\r
-               $maxtimestamp = $dbw->selectField('revision', 'MIN(rev_timestamp)',\r
-                       array('rev_page' => $title2->getArticleID() ),\r
-                       __METHOD__ );\r
-               $maxtimestamp = $maxtimestamp ? $maxtimestamp : 0;\r
-               $this->maxTimestamp = $maxtimestamp;\r
-               \r
-               parent::__construct();\r
-       }\r
-       \r
-       function getStartBody() {\r
-               wfProfileIn( __METHOD__ );\r
-               # Do a link batch query\r
-               $this->mResult->seek( 0 );\r
-               $batch = new LinkBatch();\r
-               # Give some pointers to make (last) links\r
-               $this->mForm->prevId = array();\r
-               while( $row = $this->mResult->fetchObject() ) {\r
-                       $batch->addObj( Title::makeTitleSafe( NS_USER, $row->rev_user_text ) );\r
-                       $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->rev_user_text ) );\r
-                       \r
-                       $rev_id = isset($rev_id) ? $rev_id : $row->rev_id;\r
-                       if( $rev_id > $row->rev_id )\r
-                               $this->mForm->prevId[$rev_id] = $row->rev_id;\r
-                       else if( $rev_id < $row->rev_id )\r
-                               $this->mForm->prevId[$row->rev_id] = $rev_id;\r
-                       \r
-                       $rev_id = $row->rev_id;\r
-               }\r
-               \r
-               $batch->execute();\r
-               $this->mResult->seek( 0 );\r
-\r
-               wfProfileOut( __METHOD__ );\r
-               return '';\r
-       }\r
-       \r
-       function formatRow( $row ) {\r
-               $block = new Block;\r
-               return $this->mForm->formatRevisionRow( $row );\r
-       }\r
-\r
-       function getQueryInfo() {\r
-               $conds = $this->mConds;\r
-               $conds['rev_page'] = $this->articleID;\r
-               $conds[] = "rev_timestamp < {$this->maxTimestamp}";\r
-               # Skip the latest one, as that could cause problems\r
-               if( $page = $this->title->getLatestRevID() )\r
-                       $conds[] = "rev_id != {$page}";\r
-               \r
-               return array(\r
-                       'tables' => array('revision'),\r
-                       'fields' => array( 'rev_minor_edit', 'rev_timestamp', 'rev_user', 'rev_user_text', 'rev_comment', \r
-                                'rev_id', 'rev_page', 'rev_text_id', 'rev_len', 'rev_deleted' ),\r
-                       'conds' => $conds\r
-               );\r
-       }\r
-\r
-       function getIndexField() {\r
-               return 'rev_timestamp';\r
-       }\r
-}\r
+<?php
+
+/**
+ * Special page allowing users with the appropriate permissions to 
+ * merge article histories, with some restrictions
+ *
+ * @addtogroup SpecialPage
+ */
+
+/**
+ * Constructor
+ */
+function wfSpecialMergehistory( $par ) {
+       global $wgRequest;
+
+       $form = new MergehistoryForm( $wgRequest, $par );
+       $form->execute();
+}
+
+/**
+ * The HTML form for Special:MergeHistory, which allows users with the appropriate
+ * permissions to view and restore deleted content.
+ * @addtogroup SpecialPage
+ */
+class MergehistoryForm {
+       var $mAction, $mTarget, $mDest, $mTimestamp, $mTargetID, $mDestID, $mComment;
+       var $mTargetObj, $mDestObj;
+
+       function MergehistoryForm( $request, $par = "" ) {
+               global $wgUser;
+               
+               $this->mAction = $request->getVal( 'action' );
+               $this->mTarget = $request->getVal( 'target' );
+               $this->mDest = $request->getVal( 'dest' );
+               $this->mSubmitted = $request->getBool( 'submitted' );
+               
+               $this->mTargetID = intval( $request->getVal( 'targetID' ) );
+               $this->mDestID = intval( $request->getVal( 'destID' ) );
+               $this->mTimestamp = $request->getVal( 'mergepoint' );
+               if( !preg_match("/[0-9]{14}/",$this->mTimestamp) ) {
+                       $this->mTimestamp = '';
+               }
+               $this->mComment = $request->getText( 'wpComment' );
+               
+               $this->mMerge = $request->wasPosted() && $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
+               // target page
+               if( $this->mSubmitted ) {
+                       $this->mTargetObj = Title::newFromURL( $this->mTarget );
+                       $this->mDestObj = Title::newFromURL( $this->mDest );
+               } else {
+                       $this->mTargetObj = null;
+                       $this->mDestObj = null;
+               }
+               
+               $this->preCacheMessages();
+       }
+       
+       /**
+        * As we use the same small set of messages in various methods and that
+        * they are called often, we call them once and save them in $this->message
+        */
+       function preCacheMessages() {
+               // Precache various messages
+               if( !isset( $this->message ) ) {
+                       $this->message['last'] = wfMsgExt( 'last', array( 'escape') );
+               }
+       }
+
+       function execute() {
+               global $wgOut, $wgUser;
+               
+               $wgOut->setPagetitle( wfMsgHtml( "mergehistory" ) );
+               
+               if( $this->mTargetID && $this->mDestID && $this->mAction=="submit" && $this->mMerge ) {
+                       return $this->merge();
+               }
+
+               if ( !$this->mSubmitted ) {
+                       $this->showMergeForm();
+                       return;
+               }
+
+               $errors = array();
+               if ( !$this->mTargetObj instanceof Title ) {
+                       $errors[] = wfMsgExt( 'mergehistory-invalid-source', array( 'parse' ) );
+               } elseif( !$this->mTargetObj->exists() ) {
+                       $errors[] = wfMsgExt( 'mergehistory-no-source', array( 'parse' ),
+                               wfEscapeWikiText( $this->mTargetObj->getPrefixedText() )
+                       );
+               }
+
+               if ( !$this->mDestObj instanceof Title) {
+                       $errors[] = wfMsgExt( 'mergehistory-invalid-destination', array( 'parse' ) );
+               } elseif( !$this->mDestObj->exists() ) {
+                       $errors[] = wfMsgExt( 'mergehistory-no-destination', array( 'parse' ),
+                               wfEscapeWikiText( $this->mDestObj->getPrefixedText() )
+                       );
+               }
+
+               // TODO: warn about target = dest?
+
+               if ( count( $errors ) ) {
+                       $this->showMergeForm();
+                       $wgOut->addHTML( implode( "\n", $errors ) );
+               } else {
+                       $this->showHistory();
+               }
+
+       }
+
+       function showMergeForm() {
+               global $wgOut, $wgScript;
+               
+               $wgOut->addWikiText( wfMsg( 'mergehistory-header' ) );
+               
+               $wgOut->addHtml(
+                       Xml::openElement( 'form', array(
+                               'method' => 'get',
+                               'action' => $wgScript ) ) .
+                       '<fieldset>' .
+                       Xml::element( 'legend', array(),
+                               wfMsg( 'mergehistory-box' ) ) .
+                       Xml::hidden( 'title',
+                               SpecialPage::getTitleFor( 'Mergehistory' )->getPrefixedDbKey() ) .
+                       Xml::hidden( 'submitted', '1' ) . 
+                       Xml::hidden( 'mergepoint', $this->mTimestamp ) . 
+                       Xml::openElement( 'table' ) .
+                       "<tr>
+                               <td>".Xml::label( wfMsg( 'mergehistory-from' ), '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::input( 'dest', 30, $this->mDest, array('id'=>'dest') )."</td>
+                       </tr><tr><td>" .
+                       Xml::submitButton( wfMsg( 'mergehistory-go' ) ) .
+                       "</td></tr>" .
+                       Xml::closeElement( 'table' ) .
+                       '</fieldset>' .
+                       '</form>' );
+       }
+
+       private function showHistory() {
+               global $wgLang, $wgContLang, $wgUser, $wgOut;
+
+               $this->sk = $wgUser->getSkin();
+               
+               $wgOut->setPagetitle( wfMsg( "mergehistory" ) );
+
+               $this->showMergeForm();
+
+               # List all stored revisions
+               $revisions = new MergeHistoryPager( $this, array(), $this->mTargetObj, $this->mDestObj );
+               $haveRevisions = $revisions && $revisions->getNumRows() > 0;
+
+               $titleObj = SpecialPage::getTitleFor( "Mergehistory" );
+               $action = $titleObj->getLocalURL( "action=submit" );
+               # Start the form here
+               $top = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'merge' ) );
+               $wgOut->addHtml( $top );
+
+               if( $haveRevisions ) {
+                       # Format the user-visible controls (comment field, submission button)
+                       # in a nice little table
+                       $align = $wgContLang->isRtl() ? 'left' : 'right';
+                       $table =
+                               Xml::openElement( 'fieldset' ) .
+                               Xml::openElement( 'table' ) .
+                                       "<tr>
+                                               <td colspan='2'>" .
+                                                       wfMsgExt( 'mergehistory-merge', array('parseinline'),
+                                                               $this->mTargetObj->getPrefixedText(), $this->mDestObj->getPrefixedText() ) .
+                                               "</td>
+                                       </tr>
+                                       <tr>
+                                               <td align='$align'>" .
+                                                       Xml::label( wfMsg( 'undeletecomment' ), 'wpComment' ) .
+                                               "</td>
+                                               <td>" .
+                                                       Xml::input( 'wpComment', 50, $this->mComment ) .
+                                               "</td>
+                                       </tr>
+                                       <tr>
+                                               <td>&nbsp;</td>
+                                               <td>" .
+                                                       Xml::submitButton( wfMsg( 'mergehistory-submit' ), array( 'name' => 'merge', 'id' => 'mw-merge-submit' ) ) .
+                                               "</td>
+                                       </tr>" .
+                               Xml::closeElement( 'table' ) .
+                               Xml::closeElement( 'fieldset' );
+
+                       $wgOut->addHtml( $table );
+               }
+
+               $wgOut->addHTML( "<h2 id=\"mw-mergehistory\">" . wfMsgHtml( "mergehistory-list" ) . "</h2>\n" );
+
+               if( $haveRevisions ) {
+                       $wgOut->addHTML( $revisions->getNavigationBar() );
+                       $wgOut->addHTML( "<ul>" );
+                       $wgOut->addHTML( $revisions->getBody() );
+                       $wgOut->addHTML( "</ul>" );
+                       $wgOut->addHTML( $revisions->getNavigationBar() );
+               } else {
+                       $wgOut->addWikiText( wfMsg( "mergehistory-empty" ) );
+               }
+
+               # Show relevant lines from the deletion log:
+               $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'merge' ) ) . "</h2>\n" );
+               $logViewer = new LogViewer(
+                       new LogReader(
+                               new FauxRequest(
+                                       array( 'page' => $this->mTargetObj->getPrefixedText(),
+                                                  'type' => 'merge' ) ) ) );
+               $logViewer->showList( $wgOut );
+               
+               # Slip in the hidden controls here
+               # When we submit, go by page ID to avoid some nasty but unlikely collisions.
+               # Such would happen if a page was renamed after the form loaded, but before submit
+               $misc = Xml::hidden( 'targetID', $this->mTargetObj->getArticleID() );
+               $misc .= Xml::hidden( 'destID', $this->mDestObj->getArticleID() );
+               $misc .= Xml::hidden( 'target', $this->mTarget );
+               $misc .= Xml::hidden( 'dest', $this->mDest );
+               $misc .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
+               $misc .= Xml::closeElement( 'form' );
+               $wgOut->addHtml( $misc );
+
+               return true;
+       }
+       
+       function formatRevisionRow( $row ) {
+               global $wgUser, $wgLang;
+               
+               $rev = new Revision( $row );
+               
+               $stxt = ''; 
+               $last = $this->message['last'];
+               
+               $ts = wfTimestamp( TS_MW, $row->rev_timestamp );
+               $checkBox = wfRadio( "mergepoint", $ts, false );
+               
+               $pageLink = $this->sk->makeKnownLinkObj( $rev->getTitle(), 
+                       htmlspecialchars( $wgLang->timeanddate( $ts ) ), 'oldid=' . $rev->getID() );
+               if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+                       $pageLink = '<span class="history-deleted">' . $pageLink . '</span>';
+               }
+               
+               # Last link
+               if( !$rev->userCan( Revision::DELETED_TEXT ) )
+                       $last = $this->message['last'];
+               else if( isset($this->prevId[$row->rev_id]) )
+                       $last = $this->sk->makeKnownLinkObj( $rev->getTitle(), $this->message['last'], 
+                               "&diff=" . $row->rev_id . "&oldid=" . $this->prevId[$row->rev_id] );
+               
+               $userLink = $this->sk->revUserTools( $rev );
+               
+               if(!is_null($size = $row->rev_len)) {
+                       if($size == 0)
+                               $stxt = wfMsgHtml('historyempty');
+                       else
+                               $stxt = wfMsgHtml('historysize', $wgLang->formatNum( $size ) );
+               }
+               $comment = $this->sk->revComment( $rev );
+               
+               return "<li>$checkBox ($last) $pageLink . . $userLink $stxt $comment</li>";
+       }
+
+       /**
+        * Fetch revision text link if it's available to all users
+        * @return string
+        */
+       function getPageLink( $row, $titleObj, $ts, $target ) {
+               global $wgLang;
+               
+               if( !$this->userCan($row, Revision::DELETED_TEXT) ) {
+                       return '<span class="history-deleted">' . $wgLang->timeanddate( $ts, true ) . '</span>';
+               } else {
+                       $link = $this->sk->makeKnownLinkObj( $titleObj, 
+                               $wgLang->timeanddate( $ts, true ), "target=$target&timestamp=$ts" );
+                       if( $this->isDeleted($row, Revision::DELETED_TEXT) )
+                               $link = '<span class="history-deleted">' . $link . '</span>';
+                       return $link;
+               }
+       }
+
+       function merge() {
+               global $wgOut, $wgUser;
+               # Get the titles directly from the IDs, in case the target page params 
+               # were spoofed. The queries are done based on the IDs, so it's best to 
+               # keep it consistent...
+               $targetTitle = Title::newFromID( $this->mTargetID );
+               $destTitle = Title::newFromID( $this->mDestID );
+               if( is_null($targetTitle) || is_null($destTitle) )
+                       return false; // validate these
+               if( $targetTitle->getArticleID() == $destTitle->getArticleId() )
+                       return false;
+               # Verify that this timestamp is valid
+               # Must be older than the destination page
+               $dbw = wfGetDB( DB_MASTER );
+               # Get timestamp into DB format
+               $this->mTimestamp = $this->mTimestamp ? $dbw->timestamp($this->mTimestamp) : '';
+               
+               $maxtimestamp = $dbw->selectField( 'revision', 'MIN(rev_timestamp)',
+                       array('rev_page' => $this->mDestID ),
+                       __METHOD__ );
+               # Destination page must exist with revisions
+               if( !$maxtimestamp ) {
+                       $wgOut->addWikiText( wfMsg('mergehistory-fail') );
+                       return false;
+               }
+               # Leave the latest version no matter what
+               $lasttime = $dbw->selectField( array('page','revision'), 
+                       'rev_timestamp',
+                       array('page_id' => $this->mTargetID, 'page_latest = rev_id' ),
+                       __METHOD__ );
+               # Take the most restrictive of the twain
+               $maxtimestamp = ($lasttime < $maxtimestamp) ? $lasttime : $maxtimestamp;
+               // $this->mTimestamp must be less than $maxtimestamp
+               if( $this->mTimestamp >= $maxtimestamp ) {
+                       $wgOut->addWikiText( wfMsg('mergehistory-fail') );
+                       return false;
+               }
+               # Update the revisions
+               if( $this->mTimestamp ) {
+                       $timewhere = "rev_timestamp <= {$this->mTimestamp}";
+                       $TimestampLimit = wfTimestamp(TS_MW,$this->mTimestamp);
+               } else {
+                       $timewhere = "rev_timestamp < {$maxtimestamp}";
+                       $TimestampLimit = wfTimestamp(TS_MW,$maxtimestamp);
+               }
+               
+               $dbw->update( 'revision',
+                       array( 'rev_page' => $this->mDestID ),
+                       array( 'rev_page' => $this->mTargetID,
+                               $timewhere ),
+                       __METHOD__ );
+               # Check if this did anything
+               if( !$count = $dbw->affectedRows() ) {
+                       $wgOut->addWikiText( wfMsg('mergehistory-fail') );
+                       return false;
+               }
+               # Update our logs
+               $log = new LogPage( 'merge' );
+               $log->addEntry( 'merge', $targetTitle, $this->mComment, 
+                       array($destTitle->getPrefixedText(),$TimestampLimit) );
+               
+               $wgOut->addHtml( wfMsgExt( 'mergehistory-success', array('parseinline'),
+                       $targetTitle->getPrefixedText(), $destTitle->getPrefixedText(), $count ) );
+               
+               wfRunHooks( 'ArticleMergeComplete', array( $targetTitle, $destTitle ) );
+               
+               return true;
+       }
+}
+
+class MergeHistoryPager extends ReverseChronologicalPager {
+       public $mForm, $mConds;
+
+       function __construct( $form, $conds = array(), $title, $title2 ) {
+               $this->mForm = $form;
+               $this->mConds = $conds;
+               $this->title = $title;
+               $this->articleID = $title->getArticleID();
+               
+               $dbr = wfGetDB( DB_SLAVE );
+               $maxtimestamp = $dbr->selectField( 'revision', 'MIN(rev_timestamp)',
+                       array('rev_page' => $title2->getArticleID() ),
+                       __METHOD__ );
+               $this->maxTimestamp = $maxtimestamp; 
+               
+               parent::__construct();
+       }
+       
+       function getStartBody() {
+               wfProfileIn( __METHOD__ );
+               # Do a link batch query
+               $this->mResult->seek( 0 );
+               $batch = new LinkBatch();
+               # Give some pointers to make (last) links
+               $this->mForm->prevId = array();
+               while( $row = $this->mResult->fetchObject() ) {
+                       $batch->addObj( Title::makeTitleSafe( NS_USER, $row->rev_user_text ) );
+                       $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->rev_user_text ) );
+                       
+                       $rev_id = isset($rev_id) ? $rev_id : $row->rev_id;
+                       if( $rev_id > $row->rev_id )
+                               $this->mForm->prevId[$rev_id] = $row->rev_id;
+                       else if( $rev_id < $row->rev_id )
+                               $this->mForm->prevId[$row->rev_id] = $rev_id;
+                       
+                       $rev_id = $row->rev_id;
+               }
+               
+               $batch->execute();
+               $this->mResult->seek( 0 );
+
+               wfProfileOut( __METHOD__ );
+               return '';
+       }
+       
+       function formatRow( $row ) {
+               $block = new Block;
+               return $this->mForm->formatRevisionRow( $row );
+       }
+
+       function getQueryInfo() {
+               $conds = $this->mConds;
+               $conds['rev_page'] = $this->articleID;
+               $conds[] = "rev_timestamp < {$this->maxTimestamp}";
+               # Skip the latest one, as that could cause problems
+               if( $page = $this->title->getLatestRevID() )
+                       $conds[] = "rev_id != {$page}";
+               
+               return array(
+                       'tables' => array('revision'),
+                       'fields' => array( 'rev_minor_edit', 'rev_timestamp', 'rev_user', 'rev_user_text', 'rev_comment', 
+                                'rev_id', 'rev_page', 'rev_text_id', 'rev_len', 'rev_deleted' ),
+                       'conds' => $conds
+               );
+       }
+
+       function getIndexField() {
+               return 'rev_timestamp';
+       }
+}