$wgStyleVersion!
[lhc/web/wiklou.git] / includes / SpecialUndelete.php
index 7255682..c08a777 100644 (file)
@@ -57,7 +57,7 @@ class PageArchive {
                $title = Title::newFromText( $prefix );
                if( $title ) {
                        $ns = $title->getNamespace();
-                       $encPrefix = $dbr->escapeLike( $title->getDbKey() );
+                       $encPrefix = $dbr->escapeLike( $title->getDBkey() );
                } else {
                        // Prolly won't work too good
                        // @todo handle bare namespace names cleanly?
@@ -78,7 +78,7 @@ class PageArchive {
                                array(
                                        'ar_namespace',
                                        'ar_title',
-                                       'COUNT(*) AS count'
+                                       'COUNT(*) AS count',
                                ),
                                $condition,
                                __METHOD__,
@@ -91,6 +91,24 @@ class PageArchive {
                );
        }
        
+       /**
+        * List the revisions of the given page. Returns result wrapper with
+        * (ar_minor_edit, ar_timestamp, ar_user, ar_user_text, ar_comment) fields.
+        *
+        * @return ResultWrapper
+        */
+       function listRevisions() {
+               $dbr = wfGetDB( DB_SLAVE );
+               $res = $dbr->select( 'archive',
+                       array( 'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text', 'ar_comment', 'ar_len' ),
+                       array( 'ar_namespace' => $this->title->getNamespace(),
+                              'ar_title' => $this->title->getDBkey() ),
+                       'PageArchive::listRevisions',
+                       array( 'ORDER BY' => 'ar_timestamp DESC' ) );
+               $ret = $dbr->resultObject( $res );
+               return $ret;
+       }
+       
        /**
         * List the deleted file revisions for this page, if it's a file page.
         * Returns a result wrapper with various filearchive fields, or null
@@ -106,23 +124,15 @@ class PageArchive {
                                array(
                                        'fa_id',
                                        'fa_name',
-                                       'fa_archive_name',
                                        'fa_storage_key',
-                                       'fa_storage_group',
                                        'fa_size',
                                        'fa_width',
                                        'fa_height',
-                                       'fa_bits',
-                                       'fa_metadata',
-                                       'fa_media_type',
-                                       'fa_major_mime',
-                                       'fa_minor_mime',
                                        'fa_description',
                                        'fa_user',
                                        'fa_user_text',
-                                       'fa_timestamp',
-                                       'fa_deleted' ),
-                               array( 'fa_name' => $this->title->getDbKey() ),
+                                       'fa_timestamp' ),
+                               array( 'fa_name' => $this->title->getDBkey() ),
                                __METHOD__,
                                array( 'ORDER BY' => 'fa_timestamp DESC' ) );
                        $ret = $dbr->resultObject( $res );
@@ -142,25 +152,14 @@ class PageArchive {
                $rev = $this->getRevision( $timestamp );
                return $rev ? $rev->getText() : null;
        }
-       
-       function getRevisionConds( $timestamp, $id ) {
-               if( $id ) {
-                       $id = intval($id);
-                       return "ar_rev_id=$id";
-               } else if( $timestamp ) {
-                       return "ar_timestamp=$timestamp";
-               } else {
-                       return 'ar_rev_id=0';
-               }
-       }
 
        /**
         * Return a Revision object containing data for the deleted revision.
-        * Note that the result *may* have a null page ID.
-        * @param string $timestamp or $id
+        * Note that the result *may* or *may not* have a null page ID.
+        * @param string $timestamp
         * @return Revision
         */
-       function getRevision( $timestamp, $id=null ) {
+       function getRevision( $timestamp ) {
                $dbr = wfGetDB( DB_SLAVE );
                $row = $dbr->selectRow( 'archive',
                        array(
@@ -173,11 +172,10 @@ class PageArchive {
                                'ar_minor_edit',
                                'ar_flags',
                                'ar_text_id',
-                               'ar_deleted',
                                'ar_len' ),
                        array( 'ar_namespace' => $this->title->getNamespace(),
-                              'ar_title' => $this->title->getDbkey(),
-                              $this->getRevisionConds( $dbr->timestamp($timestamp), $id ) ),
+                              'ar_title' => $this->title->getDBkey(),
+                              'ar_timestamp' => $dbr->timestamp( $timestamp ) ),
                        __METHOD__ );
                if( $row ) {
                        return new Revision( array(
@@ -191,10 +189,61 @@ class PageArchive {
                                'user_text'  => $row->ar_user_text,
                                'timestamp'  => $row->ar_timestamp,
                                'minor_edit' => $row->ar_minor_edit,
-                               'text_id'    => $row->ar_text_id,
-                               'deleted'    => $row->ar_deleted,
-                               'len'        => $row->ar_len) );
+                               'text_id'    => $row->ar_text_id ) );
+               } else {
+                       return null;
+               }
+       }
+       
+       /**
+        * Return the most-previous revision, either live or deleted, against
+        * the deleted revision given by timestamp.
+        *
+        * May produce unexpected results in case of history merges or other
+        * unusual time issues.
+        *
+        * @param string $timestamp
+        * @return Revision or null
+        */
+       function getPreviousRevision( $timestamp ) {
+               $dbr = wfGetDB( DB_SLAVE );
+               
+               // Check the previous deleted revision...
+               $row = $dbr->selectRow( 'archive',
+                       'ar_timestamp',
+                       array( 'ar_namespace' => $this->title->getNamespace(),
+                              'ar_title' => $this->title->getDBkey(),
+                              'ar_timestamp < ' .
+                                               $dbr->addQuotes( $dbr->timestamp( $timestamp ) ) ),
+                       __METHOD__,
+                       array(
+                               'ORDER BY' => 'ar_timestamp DESC',
+                               'LIMIT' => 1 ) );
+               $prevDeleted = $row ? wfTimestamp( TS_MW, $row->ar_timestamp ) : false;
+               
+               $row = $dbr->selectRow( array( 'page', 'revision' ),
+                       array( 'rev_id', 'rev_timestamp' ),
+                       array(
+                               'page_namespace' => $this->title->getNamespace(),
+                               'page_title' => $this->title->getDBkey(),
+                               'page_id = rev_page',
+                               'rev_timestamp < ' .
+                                               $dbr->addQuotes( $dbr->timestamp( $timestamp ) ) ),
+                       __METHOD__,
+                       array(
+                               'ORDER BY' => 'rev_timestamp DESC',
+                               'LIMIT' => 1 ) );
+               $prevLive = $row ? wfTimestamp( TS_MW, $row->rev_timestamp ) : false;
+               $prevLiveId = $row ? intval( $row->rev_id ) : null;
+               
+               if( $prevLive && $prevLive > $prevDeleted ) {
+                       // Most prior revision was live
+                       return Revision::newFromId( $prevLiveId );
+               } elseif( $prevDeleted ) {
+                       // Most prior revision was deleted
+                       return $this->getRevision( $prevDeleted );
                } else {
+                       // No prior revision on this page.
                        return null;
                }
        }
@@ -258,50 +307,51 @@ class PageArchive {
         * Restore the given (or all) text and file revisions for the page.
         * Once restored, the items will be removed from the archive tables.
         * The deletion log will be updated with an undeletion notice.
-        * Use -1 for the one of the timestamps to only restore files or text
         *
-        * @param string $pagetimestamp, restore all revisions since this time
+        * @param array $timestamps Pass an empty array to restore all revisions, otherwise list the ones to undelete.
         * @param string $comment
-        * @param string $filetimestamp, restore all revision from this time on
-        * @param bool $Unsuppress
+        * @param array $fileVersions
         *
-        * @return true on success.
+        * @return array(number of file revisions restored, number of image revisions restored, log message)
+        * on success, false on failure
         */
-       function undelete( $pagetimestamp = 0, $comment = '', $filetimestamp = 0, $Unsuppress = false) {
+       function undelete( $timestamps, $comment = '', $fileVersions = array() ) {
                // If both the set of text revisions and file revisions are empty,
                // restore everything. Otherwise, just restore the requested items.
-               $restoreAll = ($pagetimestamp==0 && $filetimestamp==0);
+               $restoreAll = empty( $timestamps ) && empty( $fileVersions );
                
-               $restoreText = ($restoreAll || $pagetimestamp );
-               $restoreFiles = ($restoreAll || $filetimestamp );
+               $restoreText = $restoreAll || !empty( $timestamps );
+               $restoreFiles = $restoreAll || !empty( $fileVersions );
                
-               if( $restoreText && $pagetimestamp >= 0 ) {
-                       $textRestored = $this->undeleteRevisions( $pagetimestamp, $Unsuppress );
-               } else {
-                       $textRestored = 0;
-               }
-               
-               if( $restoreFiles && $filetimestamp >= 0 && $this->title->getNamespace()==NS_IMAGE ) {
+               if( $restoreFiles && $this->title->getNamespace() == NS_IMAGE ) {
                        $img = wfLocalFile( $this->title );
-                       $this->fileStatus = $img->restore( $filetimestamp, $Unsuppress );
+                       $this->fileStatus = $img->restore( $fileVersions );
                        $filesRestored = $this->fileStatus->successCount;
                } else {
                        $filesRestored = 0;
                }
+               
+               if( $restoreText ) {
+                       $textRestored = $this->undeleteRevisions( $timestamps );
+                       if($textRestored === false) // It must be one of UNDELETE_*
+                               return false;
+               } else {
+                       $textRestored = 0;
+               }
 
                // Touch the log!
                global $wgContLang;
                $log = new LogPage( 'delete' );
                
                if( $textRestored && $filesRestored ) {
-                       $reason = wfMsgExt( 'undeletedrevisions-files', array('parsemag'),
+                       $reason = wfMsgExt( 'undeletedrevisions-files', array( 'content', 'parsemag' ),
                                $wgContLang->formatNum( $textRestored ),
                                $wgContLang->formatNum( $filesRestored ) );
                } elseif( $textRestored ) {
-                       $reason = wfMsgExt( 'undeletedrevisions', array('parsemag'),
+                       $reason = wfMsgExt( 'undeletedrevisions', array( 'content', 'parsemag' ),
                                $wgContLang->formatNum( $textRestored ) );
                } elseif( $filesRestored ) {
-                       $reason = wfMsgExt( 'undeletedfiles', array('parsemag'),
+                       $reason = wfMsgExt( 'undeletedfiles', array( 'content', 'parsemag' ),
                                $wgContLang->formatNum( $filesRestored ) );
                } else {
                        wfDebug( "Undelete: nothing undeleted...\n" );
@@ -310,13 +360,9 @@ class PageArchive {
                
                if( trim( $comment ) != '' )
                        $reason .= ": {$comment}";
-               $log->addEntry( 'restore', $this->title, $reason, array($pagetimestamp,$filetimestamp) );
+               $log->addEntry( 'restore', $this->title, $reason );
 
-               if ( $this->fileStatus && !$this->fileStatus->ok ) {
-                       return false;
-               } else {
-                       return true;
-               }
+               return array($textRestored, $filesRestored, $reason);
        }
        
        /**
@@ -324,73 +370,55 @@ class PageArchive {
         * to the cur/old tables. If the page currently exists, all revisions will
         * be stuffed into old, otherwise the most recent will go into cur.
         *
-        * @param string $timestamps, restore all revisions since this time
+        * @param array $timestamps Pass an empty array to restore all revisions, otherwise list the ones to undelete.
         * @param string $comment
         * @param array $fileVersions
-        * @param bool $Unsuppress, remove all ar_deleted/fa_deleted restrictions of seletected revs
         *
-        * @return int number of revisions restored
+        * @return mixed number of revisions restored or false on failure
         */
-       private function undeleteRevisions( $timestamp, $Unsuppress = false ) {
-               $restoreAll = ($timestamp==0);
+       private function undeleteRevisions( $timestamps ) {
+               if ( wfReadOnly() )
+                       return false;
+
+               $restoreAll = empty( $timestamps );
                
                $dbw = wfGetDB( DB_MASTER );
-               $makepage = false; // Do we need to make a new page?
 
                # Does this page already exist? We'll have to update it...
                $article = new Article( $this->title );
                $options = 'FOR UPDATE';
                $page = $dbw->selectRow( 'page',
                        array( 'page_id', 'page_latest' ),
-                       array( 'page_namespace' => $this->title->getNamespace(), 
-                               'page_title' => $this->title->getDBkey() ),
+                       array( 'page_namespace' => $this->title->getNamespace(),
+                              'page_title'     => $this->title->getDBkey() ),
                        __METHOD__,
                        $options );
-               
                if( $page ) {
                        # Page already exists. Import the history, and if necessary
                        # we'll update the latest revision field in the record.
                        $newid             = 0;
                        $pageId            = $page->page_id;
                        $previousRevId     = $page->page_latest;
-                       # Get the time span of this page
-                       $previousTimestamp = $dbw->selectField( 'revision', 'rev_timestamp',
-                               array( 'rev_id' => $previousRevId ),
-                               __METHOD__ );
-                       
-                       if( $previousTimestamp === false ) {
-                               wfDebug( __METHOD__.": existing page refers to a page_latest that does not exist\n" );
-                               return false;
-                       }
-                       # Do not fuck up histories by merging them in annoying, unrevertable ways
-                       # This page id should match any deleted ones (excepting NULL values)
-                       # We can allow restoration into redirect pages with no edit history
-                       $otherpages = $dbw->selectField( 'archive', 'COUNT(*)',
-                               array( 'ar_namespace' => $this->title->getNamespace(), 
-                                       'ar_title' => $this->title->getDBkey(), 
-                                       'ar_page_id IS NOT NULL', "ar_page_id != $pageId" ),
-                               __METHOD__,
-                               array('LIMIT' => 1) );
-                       if( $otherpages && !$this->title->isValidRestoreOverTarget() ) {
-                               return false;
-                       }
-                       
                } else {
                        # Have to create a new article...
-                       $makepage = true;
+                       $newid  = $article->insertOn( $dbw );
+                       $pageId = $newid;
                        $previousRevId = 0;
-                       $previousTimestamp = 0;
                }
 
-               $conditions = array( 
-                       'ar_namespace' => $this->title->getNamespace(), 
-                       'ar_title' => $this->title->getDBkey() );
-               if( $timestamp ) {
-                       $conditions[] = "ar_timestamp >= {$timestamp}";
+               if( $restoreAll ) {
+                       $oldones = '1 = 1'; # All revisions...
+               } else {
+                       $oldts = implode( ',',
+                               array_map( array( &$dbw, 'addQuotes' ),
+                                       array_map( array( &$dbw, 'timestamp' ),
+                                               $timestamps ) ) );
+
+                       $oldones = "ar_timestamp IN ( {$oldts} )";
                }
 
                /**
-                * Select each archived revision...
+                * Restore each revision...
                 */
                $result = $dbw->select( 'archive',
                        /* fields */ array(
@@ -403,40 +431,25 @@ class PageArchive {
                                'ar_minor_edit',
                                'ar_flags',
                                'ar_text_id',
-                               'ar_deleted',
+                               'ar_page_id',
                                'ar_len' ),
-                       /* WHERE */ 
-                               $conditions,
+                       /* WHERE */ array(
+                               'ar_namespace' => $this->title->getNamespace(),
+                               'ar_title'     => $this->title->getDBkey(),
+                               $oldones ),
                        __METHOD__,
                        /* options */ array(
                                'ORDER BY' => 'ar_timestamp' )
                        );
-               $ret = $dbw->resultObject( $result );
-               
-               $rev_count = $dbw->numRows( $result );  
-               if( $rev_count ) {
-                       # We need to seek around as just using DESC in the ORDER BY
-                       # would leave the revisions inserted in the wrong order
-                       $first = $ret->fetchObject();
-                       $ret->seek( $rev_count - 1 );
-                       $last = $ret->fetchObject();
-                       // We don't handle well changing the top revision's settings
-                       if( !$Unsuppress && $last->ar_deleted && $last->ar_timestamp > $previousTimestamp ) {
-                               wfDebug( __METHOD__.": restoration would result in a deleted top revision\n" );
-                               return false;
-                       }
-                       $ret->seek( 0 );
+               if( $dbw->numRows( $result ) < count( $timestamps ) ) {
+                       wfDebug( __METHOD__.": couldn't find all requested rows\n" );
+                       return false;
                }
                
-               if( $makepage ) {
-                       $newid  = $article->insertOn( $dbw );
-                       $pageId = $newid;
-               }
-
                $revision = null;
                $restored = 0;
-               
-               while( $row = $ret->fetchObject() ) {
+
+               while( $row = $dbw->fetchObject( $result ) ) {
                        if( $row->ar_text_id ) {
                                // Revision was deleted in 1.5+; text is in
                                // the regular text table, use the reference.
@@ -459,14 +472,17 @@ class PageArchive {
                                'timestamp'  => $row->ar_timestamp,
                                'minor_edit' => $row->ar_minor_edit,
                                'text_id'    => $row->ar_text_id,
-                               'deleted'        => $Unsuppress ? 0 : $row->ar_deleted,
-                               'len'        => $row->ar_len
+                               'len'            => $row->ar_len
                                ) );
                        $revision->insertOn( $dbw );
                        $restored++;
+                       
+                       wfRunHooks( 'ArticleRevisionUndeleted', array( &$this->title, $revision, $row->ar_page_id ) );
                }
-               
-               # If there were any revisions restored...
+               // Was anything restored at all?
+               if($restored == 0)
+                       return 0;
+
                if( $revision ) {
                        // Attach the latest revision to the page...
                        $wasnew = $article->updateIfNewerOn( $dbw, $revision, $previousRevId );
@@ -475,7 +491,7 @@ class PageArchive {
                                // Update site stats, link tables, etc
                                $article->createUpdates( $revision );
                        }
-                       
+
                        if( $newid ) {
                                wfRunHooks( 'ArticleUndelete', array( &$this->title, true ) );
                                Article::onArticleCreate( $this->title );
@@ -483,21 +499,17 @@ class PageArchive {
                                wfRunHooks( 'ArticleUndelete', array( &$this->title, false ) );
                                Article::onArticleEdit( $this->title );
                        }
+               } else {
+                       // Revision couldn't be created. This is very weird
+                       return self::UNDELETE_UNKNOWNERR;
                }
 
                # Now that it's safely stored, take it out of the archive
                $dbw->delete( 'archive',
-                       /* WHERE */ 
-                       $conditions,
-                       __METHOD__ );
-               # Update any revision left to reflect the page they belong to.
-               # If a page was deleted, and a new one created over it, then deleted,
-               # selective restore acts as a way to seperate the two. Nevertheless, we
-               # still want the rest to be restorable, in case some mistake was made.
-               $dbw->update( 'archive', 
-                       array( 'ar_page_id' => $newid ),
-                       array( 'ar_namespace' => $this->title->getNamespace(), 
-                                       'ar_title' => $this->title->getDBkey() ),
+                       /* WHERE */ array(
+                               'ar_namespace' => $this->title->getNamespace(),
+                               'ar_title' => $this->title->getDBkey(),
+                               $oldones ),
                        __METHOD__ );
 
                return $restored;
@@ -523,92 +535,72 @@ class UndeleteForm {
                $time = $request->getVal( 'timestamp' );
                $this->mTimestamp = $time ? wfTimestamp( TS_MW, $time ) : '';
                $this->mFile = $request->getVal( 'file' );
-               $this->mDiff = $request->getVal( 'diff' );
-               $this->mOldid = $request->getVal( 'oldid' );
                
-               $posted = $request->wasPosted() && $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
+               $posted = $request->wasPosted() &&
+                       $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
                $this->mRestore = $request->getCheck( 'restore' ) && $posted;
                $this->mPreview = $request->getCheck( 'preview' ) && $posted;
+               $this->mDiff = $request->getCheck( 'diff' );
                $this->mComment = $request->getText( 'wpComment' );
-               $this->mUnsuppress = $request->getVal( 'wpUnsuppress' ) && $wgUser->isAllowed( 'oversight' );
                
                if( $par != "" ) {
                        $this->mTarget = $par;
-                       $_GET['target'] = $par; // hack for Pager
                }
-               if( $wgUser->isAllowed( 'delete' ) && !$wgUser->isBlocked() ) {
+               if ( $wgUser->isAllowed( 'undelete' ) && !$wgUser->isBlocked() ) {
                        $this->mAllowed = true;
                } else {
                        $this->mAllowed = false;
                        $this->mTimestamp = '';
                        $this->mRestore = false;
                }
-               if( $this->mTarget !== "" ) {
+               if ( $this->mTarget !== "" ) {
                        $this->mTargetObj = Title::newFromURL( $this->mTarget );
                } else {
                        $this->mTargetObj = NULL;
                }
                if( $this->mRestore ) {
-                       $this->mFileTimestamp = $request->getVal('imgrestorepoint');
-                       $this->mPageTimestamp = $request->getVal('restorepoint');
-               }
-               $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 ) ) {
-                       foreach( explode(' ', 'last rev-delundel' ) as $msg ) {
-                               $this->message[$msg] = wfMsgExt( $msg, array( 'escape') );
+                       $timestamps = array();
+                       $this->mFileVersions = array();
+                       foreach( $_REQUEST as $key => $val ) {
+                               $matches = array();
+                               if( preg_match( '/^ts(\d{14})$/', $key, $matches ) ) {
+                                       array_push( $timestamps, $matches[1] );
+                               }
+                               
+                               if( preg_match( '/^fileid(\d+)$/', $key, $matches ) ) {
+                                       $this->mFileVersions[] = intval( $matches[1] );
+                               }
                        }
+                       rsort( $timestamps );
+                       $this->mTargetTimestamp = $timestamps;
                }
        }
 
        function execute() {
-               global $wgOut, $wgUser;
-               if( $this->mAllowed ) {
-                       $wgOut->setPagetitle( wfMsgHtml( "undeletepage" ) );
+               global $wgOut;
+               if ( $this->mAllowed ) {
+                       $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
                } else {
-                       $wgOut->setPagetitle( wfMsgHtml( "viewdeletedpage" ) );
+                       $wgOut->setPagetitle( wfMsg( "viewdeletedpage" ) );
                }
                
                if( is_null( $this->mTargetObj ) ) {
-               # Not all users can just browse every deleted page from the list
-                       if( $wgUser->isAllowed( 'browsearchive' ) ) {
-                               $this->showSearchForm();
+                       $this->showSearchForm();
 
-                               # List undeletable articles
-                               if( $this->mSearchPrefix ) {
-                                       $result = PageArchive::listPagesByPrefix( $this->mSearchPrefix );
-                                       $this->showList( $result );
-                               }
-                       } else {
-                               $wgOut->addWikiText( wfMsgHtml( 'undelete-header' ) );
+                       # List undeletable articles
+                       if( $this->mSearchPrefix ) {
+                               $result = PageArchive::listPagesByPrefix(
+                                       $this->mSearchPrefix );
+                               $this->showList( $result );
                        }
                        return;
                }
                if( $this->mTimestamp !== '' ) {
                        return $this->showRevision( $this->mTimestamp );
                }
-               
-               if( $this->mDiff && $this->mOldid )
-                       return $this->showDiff( $this->mDiff, $this->mOldid );
-               
                if( $this->mFile !== null ) {
-                       $file = new ArchivedFile( $this->mTargetObj, '', $this->mFile );
-                       // Check if user is allowed to see this file
-                       if( !$file->userCan( File::DELETED_FILE ) ) {
-                               $wgOut->permissionRequired( 'hiderevision' ); 
-                               return false;
-                       } else {
-                               return $this->showFile( $this->mFile );
-                       }
+                       return $this->showFile( $this->mFile );
                }
-               
                if( $this->mRestore && $this->mAction == "submit" ) {
                        return $this->undelete();
                }
@@ -636,8 +628,7 @@ class UndeleteForm {
                        '</form>' );
        }
 
-       // Generic list of deleted pages
-       private function showList( $result ) {
+       /* private */ function showList( $result ) {
                global $wgLang, $wgContLang, $wgUser, $wgOut;
                
                if( $result->numRows() == 0 ) {
@@ -665,7 +656,7 @@ class UndeleteForm {
                return true;
        }
 
-       private function showRevision( $timestamp ) {
+       /* private */ function showRevision( $timestamp ) {
                global $wgLang, $wgUser, $wgOut;
                $self = SpecialPage::getTitleFor( 'Undelete' );
                $skin = $wgUser->getSkin();
@@ -676,38 +667,41 @@ class UndeleteForm {
                $rev = $archive->getRevision( $timestamp );
                
                if( !$rev ) {
-                       $wgOut->addWikiText( wfMsg( 'undeleterevision-missing' ) );
+                       $wgOut->addWikiTexT( wfMsg( 'undeleterevision-missing' ) );
                        return;
                }
                
-               if( $rev->isDeleted(Revision::DELETED_TEXT) ) {
-                       if( !$rev->userCan(Revision::DELETED_TEXT) ) {
-                               $wgOut->addWikiText( wfMsg( 'rev-deleted-text-permission' ) );
-                               return;
-                       } else {
-                               $wgOut->addWikiText( wfMsg( 'rev-deleted-text-view' ) );
-                               $wgOut->addHTML( '<br/>' );
-                               // and we are allowed to see...
-                       }
-               }
-               
                $wgOut->setPageTitle( wfMsg( 'undeletepage' ) );
                
-               $link = $skin->makeKnownLinkObj( $self,
-                       htmlspecialchars( $this->mTargetObj->getPrefixedText() ),
-                       'target=' . $this->mTargetObj->getPrefixedUrl()
+               $link = $skin->makeKnownLinkObj(
+                       SpecialPage::getTitleFor( 'Undelete', $this->mTargetObj->getPrefixedDBkey() ),
+                       htmlspecialchars( $this->mTargetObj->getPrefixedText() )
                );
-               $time = htmlspecialchars( $wgLang->timeAndDate( $timestamp ) );
+               $time = htmlspecialchars( $wgLang->timeAndDate( $timestamp, true ) );
                $user = $skin->userLink( $rev->getUser(), $rev->getUserText() )
                        . $skin->userToolLinks( $rev->getUser(), $rev->getUserText() );
-                       
+
+               if( $this->mDiff ) {
+                       $previousRev = $archive->getPreviousRevision( $timestamp );
+                       if( $previousRev ) {
+                               $this->showDiff( $previousRev, $rev );
+                               if( $wgUser->getOption( 'diffonly' ) ) {
+                                       return;
+                               } else {
+                                       $wgOut->addHtml( '<hr />' );
+                               }
+                       } else {
+                               $wgOut->addHtml( wfMsgHtml( 'undelete-nodiff' ) );
+                       }
+               }
+               
                $wgOut->addHtml( '<p>' . wfMsgHtml( 'undelete-revision', $link, $time, $user ) . '</p>' );
                
                wfRunHooks( 'UndeleteShowRevision', array( $this->mTargetObj, $rev ) );
                
                if( $this->mPreview ) {
                        $wgOut->addHtml( "<hr />\n" );
-                       $wgOut->addWikiTextTitleTidy( $rev->revText(), $this->mTargetObj, false );
+                       $wgOut->addWikiTextTitleTidy( $rev->getText(), $this->mTargetObj, false );
                }
 
                $wgOut->addHtml(
@@ -715,7 +709,7 @@ class UndeleteForm {
                                        'readonly' => 'readonly',
                                        'cols' => intval( $wgUser->getOption( 'cols' ) ),
                                        'rows' => intval( $wgUser->getOption( 'rows' ) ) ),
-                               $rev->revText() . "\n" ) .
+                               $rev->getText() . "\n" ) .
                        wfOpenElement( 'div' ) .
                        wfOpenElement( 'form', array(
                                'method' => 'post',
@@ -733,83 +727,87 @@ class UndeleteForm {
                                'name' => 'wpEditToken',
                                'value' => $wgUser->editToken() ) ) .
                        wfElement( 'input', array(
-                               'type' => 'hidden',
+                               'type' => 'submit',
                                'name' => 'preview',
-                               'value' => '1' ) ) .
+                               'value' => wfMsg( 'showpreview' ) ) ) .
                        wfElement( 'input', array(
+                               'name' => 'diff',
                                'type' => 'submit',
-                               'value' => wfMsg( 'showpreview' ) ) ) .
+                               'value' => wfMsg( 'showdiff' ) ) ) .
                        wfCloseElement( 'form' ) .
                        wfCloseElement( 'div' ) );
        }
-
-       /**
-        * Show the changes between two deleted revisions
-        */     
-       private function showDiff( $newid, $oldid ) {
-               global $wgOut, $wgUser, $wgLang;
        
-               if( is_null($this->mTargetObj) )
-                       return;
-               $skin = $wgUser->getSkin();
-               
-               $archive = new PageArchive( $this->mTargetObj );
-               $oldRev = $archive->getRevision( null, $oldid );
-               $newRev = $archive->getRevision( null, $newid );
-               
-               if( !$oldRev || !$newRev )
-                       return;
-                       
-               $oldTitle = $this->mTargetObj->getPrefixedText();
-               $wgOut->addHtml( "<center><h3>$oldTitle</h3></center>" );
-               
-               $oldminor = $newminor = '';
+       /**
+        * Build a diff display between this and the previous either deleted
+        * or non-deleted edit.
+        * @param Revision $previousRev
+        * @param Revision $currentRev
+        * @return string HTML
+        */
+       function showDiff( $previousRev, $currentRev ) {
+               global $wgOut, $wgUser;
                
-               if($oldRev->mMinorEdit == 1) {
-                       $oldminor = wfElement( 'span', array( 'class' => 'minor' ),
-                               wfMsg( 'minoreditletter') ) . ' ';
-               }
+               $diffEngine = new DifferenceEngine();
+               $diffEngine->showDiffStyle();
+               $wgOut->addHtml(
+                       "<div>" .
+                       "<table border='0' width='98%' cellpadding='0' cellspacing='4' class='diff'>" .
+                       "<col class='diff-marker' />" .
+                       "<col class='diff-content' />" .
+                       "<col class='diff-marker' />" .
+                       "<col class='diff-content' />" .
+                       "<tr>" .
+                               "<td colspan='2' width='50%' align='center' class='diff-otitle'>" .
+                               $this->diffHeader( $previousRev ) .
+                               "</td>" .
+                               "<td colspan='2' width='50%' align='center' class='diff-ntitle'>" .
+                               $this->diffHeader( $currentRev ) .
+                               "</td>" .
+                       "</tr>" .
+                       $diffEngine->generateDiffBody(
+                               $previousRev->getText(), $currentRev->getText() ) .
+                       "</table>" .
+                       "</div>\n" );
 
-               if($newRev->mMinorEdit == 1) {
-                       $newminor = wfElement( 'span', array( 'class' => 'minor' ),
-                       wfMsg( 'minoreditletter') ) . ' ';
+       }
+       
+       private function diffHeader( $rev ) {
+               global $wgUser, $wgLang, $wgLang;
+               $sk = $wgUser->getSkin();
+               $isDeleted = !( $rev->getId() && $rev->getTitle() );
+               if( $isDeleted ) {
+                       /// @fixme $rev->getTitle() is null for deleted revs...?
+                       $targetPage = SpecialPage::getTitleFor( 'Undelete' );
+                       $targetQuery = 'target=' .
+                               $this->mTargetObj->getPrefixedUrl() .
+                               '&timestamp=' .
+                               wfTimestamp( TS_MW, $rev->getTimestamp() );
+               } else {
+                       /// @fixme getId() may return non-zero for deleted revs...
+                       $targetPage = $rev->getTitle();
+                       $targetQuery = 'oldid=' . $rev->getId();
                }
-               
-               $ot = $wgLang->timeanddate( $oldRev->getTimestamp(), true );
-               $nt = $wgLang->timeanddate( $newRev->getTimestamp(), true );
-               $oldHeader = htmlspecialchars( wfMsg( 'revisionasof', $ot ) ) . "<br />" .
-                       $skin->revUserTools( $oldRev, true ) . "<br />" .
-                       $oldminor . $skin->revComment( $oldRev, false ) . "<br />";
-               $newHeader = htmlspecialchars( wfMsg( 'revisionasof', $nt ) ) . "<br />" .
-                       $skin->revUserTools( $newRev, true ) . " <br />" .
-                       $newminor . $skin->revComment( $newRev, false ) . "<br />";
-               
-               $otext = $oldRev->revText();
-               $ntext = $newRev->revText();
-               
-               $wgOut->addStyle( 'common/diff.css' );
-        $wgOut->addHtml(
-            "<div>" .
-            "<table border='0' width='98%' cellpadding='0' cellspacing='4' class='diff'>" .
-            "<col class='diff-marker' />" .
-            "<col class='diff-content' />" .
-            "<col class='diff-marker' />" .
-            "<col class='diff-content' />" .
-            "<tr>" .
-                "<td colspan='2' width='50%' align='center' class='diff-otitle'>" . $oldHeader . "</td>" .
-                "<td colspan='2' width='50%' align='center' class='diff-ntitle'>" . $newHeader . "</td>" .
-            "</tr>" .
-            DifferenceEngine::generateDiffBody( $otext, $ntext ) .
-            "</table>" .
-            "</div>\n" );
-                       
-               return true;
+               return
+                       '<div id="mw-diff-otitle1"><strong>' .
+                               $sk->makeLinkObj( $targetPage,
+                                       wfMsgHtml( 'revisionasof',
+                                               $wgLang->timeanddate( $rev->getTimestamp(), true ) ),
+                                       $targetQuery ) .
+                               ( $isDeleted ? ' ' . wfMsgHtml( 'deletedrev' ) : '' ) .
+                       '</strong></div>' .
+                       '<div id="mw-diff-otitle2">' .
+                               $sk->revUserTools( $rev ) . '<br/>' .
+                       '</div>' .
+                       '<div id="mw-diff-otitle3">' .
+                               $sk->revComment( $rev ) . '<br/>' .
+                       '</div>';
        }
        
        /**
         * Show a deleted file version requested by the visitor.
         */
-       private function showFile( $key ) {
+       function showFile( $key ) {
                global $wgOut, $wgRequest;
                $wgOut->disable();
                
@@ -825,35 +823,47 @@ class UndeleteForm {
                $store->stream( $key );
        }
 
-       private function showHistory() {
+       /* private */ function showHistory() {
                global $wgLang, $wgContLang, $wgUser, $wgOut;
 
-               $this->sk = $wgUser->getSkin();
-               if( $this->mAllowed ) {
+               $sk = $wgUser->getSkin();
+               if ( $this->mAllowed ) {
                        $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
                } else {
                        $wgOut->setPagetitle( wfMsg( 'viewdeletedpage' ) );
                }
-               
-               $wgOut->addWikiText( wfMsgHtml( 'undeletepagetitle', $this->mTargetObj->getPrefixedText()) );
 
                $archive = new PageArchive( $this->mTargetObj );
-
-               if( $this->mAllowed ) {
-                       $wgOut->addWikiText( '<p>' . wfMsgHtml( "undeletehistory" ) . '</p>' );
-                       $wgOut->addHtml( '<p>' . wfMsgHtml( "undeleterevdel" ) . '</p>' );
+               /*
+               $text = $archive->getLastRevisionText();
+               if( is_null( $text ) ) {
+                       $wgOut->addWikiText( wfMsg( "nohistory" ) );
+                       return;
+               }
+               */
+               if ( $this->mAllowed ) {
+                       $wgOut->addWikiText( wfMsg( "undeletehistory" ) );
                } else {
-                       $wgOut->addWikiText( wfMsgHtml( "undeletehistorynoadmin" ) );
+                       $wgOut->addWikiText( wfMsg( "undeletehistorynoadmin" ) );
                }
 
                # List all stored revisions
-               $revisions = new UndeleteRevisionsPager( $this, array(), $this->mTargetObj );   
+               $revisions = $archive->listRevisions();
                $files = $archive->listFiles();
 
-               $haveRevisions = $revisions && $revisions->getNumRows() > 0;
+               $haveRevisions = $revisions && $revisions->numRows() > 0;
                $haveFiles = $files && $files->numRows() > 0;
 
                # Batch existence check on user and talk pages
+               if( $haveRevisions ) {
+                       $batch = new LinkBatch();
+                       while( $row = $revisions->fetchObject() ) {
+                               $batch->addObj( Title::makeTitleSafe( NS_USER, $row->ar_user_text ) );
+                               $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->ar_user_text ) );
+                       }
+                       $batch->execute();
+                       $revisions->seek( 0 );
+               }
                if( $haveFiles ) {
                        $batch = new LinkBatch();
                        while( $row = $files->fetchObject() ) {
@@ -864,7 +874,7 @@ class UndeleteForm {
                        $files->seek( 0 );
                }
 
-               if( $this->mAllowed ) {
+               if ( $this->mAllowed ) {
                        $titleObj = SpecialPage::getTitleFor( "Undelete" );
                        $action = $titleObj->getLocalURL( "action=submit" );
                        # Start the form here
@@ -872,6 +882,20 @@ class UndeleteForm {
                        $wgOut->addHtml( $top );
                }
 
+               # Show relevant lines from the deletion log:
+               $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" );
+               $logViewer = new LogViewer(
+                       new LogReader(
+                               new FauxRequest(
+                                       array( 
+                                               'page' => $this->mTargetObj->getPrefixedText(),
+                                               'type' => 'delete' 
+                                       ) 
+                               )
+                       ), LogViewer::NO_ACTION_LINK
+               );
+               $logViewer->showList( $wgOut );
+
                if( $this->mAllowed && ( $haveRevisions || $haveFiles ) ) {
                        # Format the user-visible controls (comment field, submission button)
                        # in a nice little table
@@ -897,10 +921,6 @@ class UndeleteForm {
                                                <td>" .
                                                        Xml::submitButton( wfMsg( 'undeletebtn' ), array( 'name' => 'restore', 'id' => 'mw-undelete-submit' ) ) .
                                                        Xml::element( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'undeletereset' ), 'id' => 'mw-undelete-reset' ) ) .
-                                                       Xml::openElement( 'p' ) .
-                                                       Xml::check( 'wpUnsuppress', $this->mUnsuppress, array('id' => 'mw-undelete-unsupress') ) . ' ' .
-                                                       Xml::label( wfMsgHtml('revdelete-unsuppress'), 'mw-undelete-unsupress' ) .
-                                                       Xml::closeElement( 'p' ) .
                                                "</td>
                                        </tr>" .
                                Xml::closeElement( 'table' ) .
@@ -909,38 +929,75 @@ class UndeleteForm {
                        $wgOut->addHtml( $table );
                }
 
-               $wgOut->addHTML( "<h2 id=\"pagehistory\">" . wfMsgHtml( "history" ) . "</h2>\n" );
+               $wgOut->addHTML( "<h2>" . htmlspecialchars( wfMsg( "history" ) ) . "</h2>\n" );
 
                if( $haveRevisions ) {
-                       $wgOut->addHTML( '<p>' . wfMsgHtml( "restorepoint" ) . '</p>' );
-                       $wgOut->addHTML( $revisions->getNavigationBar() );
-                       $wgOut->addHTML( "<ul>" );
-                       $wgOut->addHTML( "<li>" . wfRadio( "restorepoint", -1, false ) . " " . wfMsgHtml('restorenone') . "</li>" );
-                       $wgOut->addHTML( $revisions->getBody() );
-                       $wgOut->addHTML( "</ul>" );
-                       $wgOut->addHTML( $revisions->getNavigationBar() );
+                       # The page's stored (deleted) history:
+                       $wgOut->addHTML("<ul>");
+                       $target = urlencode( $this->mTarget );
+                       $remaining = $revisions->numRows();
+                       $earliestLiveTime = $this->getEarliestTime( $this->mTargetObj );
+                       
+                       while( $row = $revisions->fetchObject() ) {
+                               $remaining--;
+                               $ts = wfTimestamp( TS_MW, $row->ar_timestamp );
+                               if ( $this->mAllowed ) {
+                                       $checkBox = Xml::check( "ts$ts" );
+                                       $pageLink = $sk->makeKnownLinkObj( $titleObj,
+                                               $wgLang->timeanddate( $ts, true ),
+                                               "target=$target&timestamp=$ts" );
+                                       if( ($remaining > 0) ||
+                                                       ($earliestLiveTime && $ts > $earliestLiveTime ) ) {
+                                               $diffLink = '(' .
+                                                       $sk->makeKnownLinkObj( $titleObj,
+                                                               wfMsgHtml( 'diff' ),
+                                                               "target=$target&timestamp=$ts&diff=prev" ) .
+                                                       ')';
+                                       } else {
+                                               // No older revision to diff against
+                                               $diffLink = '';
+                                       }
+                               } else {
+                                       $checkBox = '';
+                                       $pageLink = $wgLang->timeanddate( $ts, true );
+                                       $diffLink = '';
+                               }
+                               $userLink = $sk->userLink( $row->ar_user, $row->ar_user_text ) . $sk->userToolLinks( $row->ar_user, $row->ar_user_text );
+                               $stxt = '';
+                               if (!is_null($size = $row->ar_len)) {
+                                       if ($size == 0) {
+                                               $stxt = wfMsgHtml('historyempty');
+                                       } else {
+                                               $stxt = wfMsgHtml('historysize', $wgLang->formatNum( $size ) );
+                                       }
+                               }
+                               $comment = $sk->commentBlock( $row->ar_comment );
+                               $wgOut->addHTML( "<li>$checkBox $pageLink $diffLink . . $userLink $stxt $comment</li>\n" );
+
+                       }
+                       $revisions->free();
+                       $wgOut->addHTML("</ul>");
                } else {
                        $wgOut->addWikiText( wfMsg( "nohistory" ) );
                }
+
                if( $haveFiles ) {
-                       $wgOut->addHtml( "<h2 id=\"filehistory\">" . wfMsgHtml( 'filehist' ) . "</h2>\n" );
-                       $wgOut->addHTML( wfMsgHtml( "restorepoint" ) );
+                       $wgOut->addHtml( "<h2>" . wfMsgHtml( 'filehist' ) . "</h2>\n" );
                        $wgOut->addHtml( "<ul>" );
-                       $wgOut->addHTML( "<li>" . wfRadio( "imgrestorepoint", -1, false ) . " " . wfMsgHtml('restorenone') . "</li>" );
                        while( $row = $files->fetchObject() ) {
-                               $file = ArchivedFile::newFromRow( $row );
-                       
                                $ts = wfTimestamp( TS_MW, $row->fa_timestamp );
-                               if( $this->mAllowed && $row->fa_storage_key ) {
-                                       $checkBox = wfRadio( "imgrestorepoint", $ts, false );
+                               if ( $this->mAllowed && $row->fa_storage_key ) {
+                                       $checkBox = Xml::check( "fileid" . $row->fa_id );
                                        $key = urlencode( $row->fa_storage_key );
                                        $target = urlencode( $this->mTarget );
-                                       $pageLink = $this->getFileLink( $file, $titleObj, $ts, $target, $key );
+                                       $pageLink = $sk->makeKnownLinkObj( $titleObj,
+                                               $wgLang->timeanddate( $ts, true ),
+                                               "target=$target&file=$key" );
                                } else {
                                        $checkBox = '';
                                        $pageLink = $wgLang->timeanddate( $ts, true );
                                }
-                               $userLink = $this->getFileUser( $file );
+                               $userLink = $sk->userLink( $row->fa_user, $row->fa_user_text ) . $sk->userToolLinks( $row->fa_user, $row->fa_user_text );
                                $data =
                                        wfMsgHtml( 'widthheight',
                                                $wgLang->formatNum( $row->fa_width ),
@@ -948,40 +1005,14 @@ class UndeleteForm {
                                        ' (' .
                                        wfMsgHtml( 'nbytes', $wgLang->formatNum( $row->fa_size ) ) .
                                        ')';
-                               $comment = $this->getFileComment( $file );
-                               $rd='';
-                               if( $wgUser->isAllowed( 'deleterevision' ) ) {
-                                       $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
-                                       if( !$file->userCan(File::DELETED_RESTRICTED ) ) {
-                                       // If revision was hidden from sysops
-                                               $del = $this->message['rev-delundel'];
-                                       } else {
-                                               $del = $this->sk->makeKnownLinkObj( $revdel,
-                                                       $this->message['rev-delundel'],
-                                                       'target=' . urlencode( $this->mTarget ) .
-                                                       '&fileid=' . urlencode( $row->fa_id ) );
-                                               // Bolden oversighted content
-                                               if( $file->isDeleted( File::DELETED_RESTRICTED ) )
-                                                       $del = "<strong>$del</strong>";
-                                       }
-                                       $rd = "<tt>(<small>$del</small>)</tt>";
-                               }
-                               $wgOut->addHTML( "<li>$checkBox $rd $pageLink . . $userLink $data $comment</li>\n" );
+                               $comment = $sk->commentBlock( $row->fa_description );
+                               $wgOut->addHTML( "<li>$checkBox $pageLink . . $userLink $data $comment</li>\n" );
                        }
                        $files->free();
                        $wgOut->addHTML( "</ul>" );
                }
 
-               # Show relevant lines from the deletion log:
-               $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" );
-               $logViewer = new LogViewer(
-                       new LogReader(
-                               new FauxRequest(
-                                       array( 'page' => $this->mTargetObj->getPrefixedText(),
-                                                  'type' => 'delete' ) ) ) );
-               $logViewer->showList( $wgOut );
-               
-               if( $this->mAllowed ) {
+               if ( $this->mAllowed ) {
                        # Slip in the hidden controls here
                        $misc  = Xml::hidden( 'target', $this->mTarget );
                        $misc .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
@@ -992,151 +1023,38 @@ class UndeleteForm {
                return true;
        }
        
-       function formatRevisionRow( $row ) {
-               global $wgUser, $wgLang;
-               
-               $rev = new Revision( array(
-                               'page'       => $this->mTargetObj->getArticleId(),
-                               'id'         => $row->ar_rev_id,
-                               'comment'    => $row->ar_comment,
-                               'user'       => $row->ar_user,
-                               'user_text'  => $row->ar_user_text,
-                               'timestamp'  => $row->ar_timestamp,
-                               'minor_edit' => $row->ar_minor_edit,
-                               'text_id'    => $row->ar_text_id,
-                               'deleted'    => $row->ar_deleted,
-                               'len'        => $row->ar_len) );
-               
-               $stxt = ''; 
-               $last = $this->message['last'];
-               
-               if( $this->mAllowed ) {
-                       $ts = wfTimestamp( TS_MW, $row->ar_timestamp );
-                       $checkBox = wfRadio( "restorepoint", $ts, false );
-                       $titleObj = SpecialPage::getTitleFor( "Undelete" );
-                       $pageLink = $this->getPageLink( $rev, $titleObj, $ts, $this->mTarget );
-                       # Last link
-                       if( !$rev->userCan( Revision::DELETED_TEXT ) )
-                               $last = $this->message['last'];
-                       else if( isset($this->prevId[$row->ar_rev_id]) )
-                               $last = $this->sk->makeKnownLinkObj( $titleObj, $this->message['last'], "target=" . $this->mTarget .
-                               "&diff=" . $row->ar_rev_id . "&oldid=" . $this->prevId[$row->ar_rev_id] );
-               } else {
-                       $checkBox = '';
-                       $pageLink = $wgLang->timeanddate( $ts, true );
-               }
-               $userLink = $this->sk->revUserTools( $rev );
-               
-               if(!is_null($size = $row->ar_len)) {
-                       if($size == 0)
-                               $stxt = wfMsgHtml('historyempty');
-                       else
-                               $stxt = wfMsgHtml('historysize', $wgLang->formatNum( $size ) );
-               }
-               $comment = $this->sk->revComment( $rev );
-               $revd='';
-               if( $wgUser->isAllowed( 'deleterevision' ) ) {
-                       $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
-                       if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
-                       // If revision was hidden from sysops
-                               $del = $this->message['rev-delundel'];                  
-                       } else {
-                               $del = $this->sk->makeKnownLinkObj( $revdel,
-                                       $this->message['rev-delundel'],
-                                       'target=' . urlencode( $this->mTarget ) .
-                                       '&artimestamp=' . urlencode( $row->ar_timestamp ) );
-                               // Bolden oversighted content
-                               if( $rev->isDeleted( Revision::DELETED_RESTRICTED ) )
-                                       $del = "<strong>$del</strong>";
-                       }
-                       $revd = "<tt>(<small>$del</small>)</tt>";
-               }
-               
-               return "<li>$checkBox $revd ($last) $pageLink . . $userLink $stxt $comment</li>";
-       }
-
-       /**
-        * Fetch revision text link if it's available to all users
-        * @return string
-        */
-       function getPageLink( $rev, $titleObj, $ts, $target ) {
-               global $wgLang;
-               
-               if( !$rev->userCan(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( $rev->isDeleted(Revision::DELETED_TEXT) )
-                               $link = '<span class="history-deleted">' . $link . '</span>';
-                       return $link;
-               }
-       }
-       
-       /**
-        * Fetch image view link if it's available to all users
-        * @return string
-        */
-       function getFileLink( $file, $titleObj, $ts, $target, $key ) {
-               global $wgLang;
-
-               if( !$file->userCan(File::DELETED_FILE) ) {
-                       return '<span class="history-deleted">' . $wgLang->timeanddate( $ts, true ) . '</span>';
-               } else {
-                       $link = $this->sk->makeKnownLinkObj( $titleObj, $wgLang->timeanddate( $ts, true ), "target=$target&file=$key" );
-                       if( $file->isDeleted(File::DELETED_FILE) )
-                               $link = '<span class="history-deleted">' . $link . '</span>';
-                       return $link;
-               }
-       }
-
-       /**
-        * Fetch file's user id if it's available to this user
-        * @return string
-        */
-       function getFileUser( $file ) { 
-               if( !$file->userCan(File::DELETED_USER) ) {
-                       return '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
-               } else {
-                       $link = $this->sk->userLink( $file->user, $file->userText ) . 
-                               $this->sk->userToolLinks( $file->user, $file->userText );
-                       if( $file->isDeleted(File::DELETED_USER) )
-                               $link = '<span class="history-deleted">' . $link . '</span>';
-                       return $link;
-               }
-       }
-
-       /**
-        * Fetch file upload comment if it's available to this user
-        * @return string
-        */
-       function getFileComment( $file ) {
-               if( !$file->userCan(File::DELETED_COMMENT) ) {
-                       return '<span class="history-deleted"><span class="comment">' . wfMsgHtml( 'rev-deleted-comment' ) . '</span></span>';
-               } else {
-                       $link = $this->sk->commentBlock( $file->description );
-                       if( $file->isDeleted(File::DELETED_COMMENT) )
-                               $link = '<span class="history-deleted">' . $link . '</span>';
-                       return $link;
+       private function getEarliestTime( $title ) {
+               $dbr = wfGetDB( DB_SLAVE );
+               if( $title->exists() ) {
+                       $min = $dbr->selectField( 'revision',
+                               'MIN(rev_timestamp)',
+                               array( 'rev_page' => $title->getArticleId() ),
+                               __METHOD__ );
+                       return wfTimestampOrNull( TS_MW, $min );
                }
+               return null;
        }
 
        function undelete() {
                global $wgOut, $wgUser;
+               if ( wfReadOnly() ) {
+                       $wgOut->readOnlyPage();
+                       return;
+               }
                if( !is_null( $this->mTargetObj ) ) {
                        $archive = new PageArchive( $this->mTargetObj );
                        
                        $ok = $archive->undelete(
-                               $this->mPageTimestamp,
+                               $this->mTargetTimestamp,
                                $this->mComment,
-                               $this->mFileTimestamp,
-                               $this->mUnsuppress );
-                       if( $ok ) {
+                               $this->mFileVersions );
+
+                       if( is_array($ok) ) {
                                $skin = $wgUser->getSkin();
-                               $link = $skin->makeKnownLinkObj( $this->mTargetObj, $this->mTargetObj->getPrefixedText(), 'redirect=no' );
+                               $link = $skin->makeKnownLinkObj( $this->mTargetObj );
                                $wgOut->addHtml( wfMsgWikiHtml( 'undeletedpage', $link ) );
                        } else {
                                $wgOut->showFatalError( wfMsg( "cannotundelete" ) );
-                               $wgOut->addHtml( '<p>' . wfMsgHtml( "undeleterevdel" ) . '</p>' );
                        }
 
                        // Show file deletion warnings and errors
@@ -1150,62 +1068,3 @@ class UndeleteForm {
                return false;
        }
 }
-
-class UndeleteRevisionsPager extends ReverseChronologicalPager {
-       public $mForm, $mConds;
-
-       function __construct( $form, $conds = array(), $title ) {
-               $this->mForm = $form;
-               $this->mConds = $conds;
-               $this->title = $title;
-               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->ar_user_text ) );
-                       $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->ar_user_text ) );
-                       
-                       $rev_id = isset($rev_id) ? $rev_id : $row->ar_rev_id;
-                       if( $rev_id > $row->ar_rev_id )
-                               $this->mForm->prevId[$rev_id] = $row->ar_rev_id;
-                       else if( $rev_id < $row->ar_rev_id )
-                               $this->mForm->prevId[$row->ar_rev_id] = $rev_id;
-                       
-                       $rev_id = $row->ar_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['ar_namespace'] = $this->title->getNamespace();
-               $conds['ar_title'] = $this->title->getDBkey();
-               return array(
-                       'tables' => array('archive'),
-                       'fields' => array( 'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text', 'ar_comment', 
-                               'ar_rev_id', 'ar_text_id', 'ar_len', 'ar_deleted' ),
-                       'conds' => $conds
-               );
-       }
-
-       function getIndexField() {
-               return 'ar_timestamp';
-       }
-}