X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fspecials%2FSpecialUndelete.php;h=17d4c4b03cada6473bd4a2648a4a1c83d195c823;hb=9184dc83d66840afaf1224ec65cae76a379280b3;hp=d8c9d1310b531fc514ed2492131ee4c9e991fefc;hpb=a3d254fbbcb58c00024746721701b219e105e3d8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index d8c9d1310b..17d4c4b03c 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -1,34 +1,42 @@
 <?php
-
 /**
- * Special page allowing users with the appropriate permissions to view
- * and restore deleted content
+ * Implements Special:Undelete
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
  *
  * @file
  * @ingroup SpecialPage
  */
 
-/**
- * Constructor
- */
-function wfSpecialUndelete( $par ) {
-	global $wgRequest;
-
-	$form = new UndeleteForm( $wgRequest, $par );
-	$form->execute();
-}
-
 /**
  * Used to show archived pages and eventually restore them.
+ *
  * @ingroup SpecialPage
  */
 class PageArchive {
+
+	/**
+	 * @var Title
+	 */
 	protected $title;
 	var $fileStatus;
 
 	function __construct( $title ) {
 		if( is_null( $title ) ) {
-			throw new MWException( 'Archiver() given a null title.');
+			throw new MWException( __METHOD__ . ' given a null title.' );
 		}
 		$this->title = $title;
 	}
@@ -50,6 +58,7 @@ class PageArchive {
 	 * given title prefix.
 	 * Returns result wrapper with (ar_namespace, ar_title, count) fields.
 	 *
+	 * @param $prefix String: title prefix
 	 * @return ResultWrapper
 	 */
 	public static function listPagesByPrefix( $prefix ) {
@@ -58,20 +67,24 @@ class PageArchive {
 		$title = Title::newFromText( $prefix );
 		if( $title ) {
 			$ns = $title->getNamespace();
-			$encPrefix = $dbr->escapeLike( $title->getDBkey() );
+			$prefix = $title->getDBkey();
 		} else {
 			// Prolly won't work too good
 			// @todo handle bare namespace names cleanly?
 			$ns = 0;
-			$encPrefix = $dbr->escapeLike( $prefix );
 		}
 		$conds = array(
 			'ar_namespace' => $ns,
-			"ar_title LIKE '$encPrefix%'",
+			'ar_title' . $dbr->buildLike( $prefix, $dbr->anyString() ),
 		);
 		return self::listPages( $dbr, $conds );
 	}
 
+	/**
+	 * @param $dbr DatabaseBase
+	 * @param $condition
+	 * @return bool|ResultWrapper
+	 */
 	protected static function listPages( $dbr, $condition ) {
 		return $dbr->resultObject(
 			$dbr->select(
@@ -101,9 +114,12 @@ class PageArchive {
 	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', 'ar_deleted' ),
+			array(
+				'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text',
+				'ar_comment', 'ar_len', 'ar_deleted', 'ar_rev_id', 'ar_sha1'
+			),
 			array( 'ar_namespace' => $this->title->getNamespace(),
-			       'ar_title' => $this->title->getDBkey() ),
+				   'ar_title' => $this->title->getDBkey() ),
 			'PageArchive::listRevisions',
 			array( 'ORDER BY' => 'ar_timestamp DESC' ) );
 		$ret = $dbr->resultObject( $res );
@@ -150,22 +166,11 @@ class PageArchive {
 		return null;
 	}
 
-	/**
-	 * Fetch (and decompress if necessary) the stored text for the deleted
-	 * revision of the page with the given timestamp.
-	 *
-	 * @return string
-	 * @deprecated Use getRevision() for more flexible information
-	 */
-	function getRevisionText( $timestamp ) {
-		$rev = $this->getRevision( $timestamp );
-		return $rev ? $rev->getText() : null;
-	}
-
 	/**
 	 * Return a Revision object containing data for the deleted revision.
 	 * Note that the result *may* or *may not* have a null page ID.
-	 * @param string $timestamp
+	 *
+	 * @param $timestamp String
 	 * @return Revision
 	 */
 	function getRevision( $timestamp ) {
@@ -182,10 +187,12 @@ class PageArchive {
 				'ar_flags',
 				'ar_text_id',
 				'ar_deleted',
-				'ar_len' ),
+				'ar_len',
+				'ar_sha1',
+			),
 			array( 'ar_namespace' => $this->title->getNamespace(),
-			       'ar_title' => $this->title->getDBkey(),
-			       'ar_timestamp' => $dbr->timestamp( $timestamp ) ),
+					'ar_title' => $this->title->getDBkey(),
+					'ar_timestamp' => $dbr->timestamp( $timestamp ) ),
 			__METHOD__ );
 		if( $row ) {
 			return Revision::newFromArchiveRow( $row, array( 'page' => $this->title->getArticleId() ) );
@@ -201,7 +208,7 @@ class PageArchive {
 	 * May produce unexpected results in case of history merges or other
 	 * unusual time issues.
 	 *
-	 * @param string $timestamp
+	 * @param $timestamp String
 	 * @return Revision or null
 	 */
 	function getPreviousRevision( $timestamp ) {
@@ -211,8 +218,8 @@ class PageArchive {
 		$row = $dbr->selectRow( 'archive',
 			'ar_timestamp',
 			array( 'ar_namespace' => $this->title->getNamespace(),
-			       'ar_title' => $this->title->getDBkey(),
-			       'ar_timestamp < ' .
+				   'ar_title' => $this->title->getDBkey(),
+				   'ar_timestamp < ' .
 						$dbr->addQuotes( $dbr->timestamp( $timestamp ) ) ),
 			__METHOD__,
 			array(
@@ -249,12 +256,15 @@ class PageArchive {
 
 	/**
 	 * Get the text from an archive row containing ar_text, ar_flags and ar_text_id
+	 *
+	 * @param $row Object: database row
+	 * @return Revision
 	 */
 	function getTextFromRow( $row ) {
 		if( is_null( $row->ar_text_id ) ) {
 			// An old row from MediaWiki 1.4 or previous.
 			// Text is embedded in this row in classic compression format.
-			return Revision::getRevisionText( $row, "ar_" );
+			return Revision::getRevisionText( $row, 'ar_' );
 		} else {
 			// New-style: keyed to the text storage backend.
 			$dbr = wfGetDB( DB_SLAVE );
@@ -266,40 +276,40 @@ class PageArchive {
 		}
 	}
 
-
 	/**
 	 * Fetch (and decompress if necessary) the stored text of the most
 	 * recently edited deleted revision of the page.
 	 *
 	 * If there are no archived revisions for the page, returns NULL.
 	 *
-	 * @return string
+	 * @return String
 	 */
 	function getLastRevisionText() {
 		$dbr = wfGetDB( DB_SLAVE );
 		$row = $dbr->selectRow( 'archive',
 			array( 'ar_text', 'ar_flags', 'ar_text_id' ),
 			array( 'ar_namespace' => $this->title->getNamespace(),
-			       'ar_title' => $this->title->getDBkey() ),
-			'PageArchive::getLastRevisionText',
+				   'ar_title' => $this->title->getDBkey() ),
+			__METHOD__,
 			array( 'ORDER BY' => 'ar_timestamp DESC' ) );
 		if( $row ) {
 			return $this->getTextFromRow( $row );
 		} else {
-			return NULL;
+			return null;
 		}
 	}
 
 	/**
 	 * Quick check if any archived revisions are present for the page.
-	 * @return bool
+	 *
+	 * @return Boolean
 	 */
 	function isDeleted() {
 		$dbr = wfGetDB( DB_SLAVE );
 		$n = $dbr->selectField( 'archive', 'COUNT(ar_title)',
 			array( 'ar_namespace' => $this->title->getNamespace(),
-			       'ar_title' => $this->title->getDBkey() ) );
-		return ($n > 0);
+				   'ar_title' => $this->title->getDBkey() ) );
+		return ( $n > 0 );
 	}
 
 	/**
@@ -307,10 +317,10 @@ class PageArchive {
 	 * Once restored, the items will be removed from the archive tables.
 	 * The deletion log will be updated with an undeletion notice.
 	 *
-	 * @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
+	 * @param $timestamps Array: pass an empty array to restore all revisions, otherwise list the ones to undelete.
+	 * @param $comment String
+	 * @param $fileVersions Array
+	 * @param $unsuppress Boolean
 	 *
 	 * @return array(number of file revisions restored, number of image revisions restored, log message)
 	 * on success, false on failure
@@ -326,15 +336,19 @@ class PageArchive {
 		if( $restoreFiles && $this->title->getNamespace() == NS_FILE ) {
 			$img = wfLocalFile( $this->title );
 			$this->fileStatus = $img->restore( $fileVersions, $unsuppress );
+			if ( !$this->fileStatus->isOk() ) {
+				return false;
+			}
 			$filesRestored = $this->fileStatus->successCount;
 		} else {
 			$filesRestored = 0;
 		}
 
 		if( $restoreText ) {
-			$textRestored = $this->undeleteRevisions( $timestamps, $unsuppress );
-			if($textRestored === false) // It must be one of UNDELETE_*
+			$textRestored = $this->undeleteRevisions( $timestamps, $unsuppress, $comment );
+			if( $textRestored === false ) { // It must be one of UNDELETE_*
 				return false;
+			}
 		} else {
 			$textRestored = 0;
 		}
@@ -358,11 +372,12 @@ class PageArchive {
 			return false;
 		}
 
-		if( trim( $comment ) != '' )
-			$reason .= ": {$comment}";
+		if( trim( $comment ) != '' ) {
+			$reason .= wfMsgForContent( 'colon-separator' ) . $comment;
+		}
 		$log->addEntry( 'restore', $this->title, $reason );
 
-		return array($textRestored, $filesRestored, $reason);
+		return array( $textRestored, $filesRestored, $reason );
 	}
 
 	/**
@@ -370,29 +385,34 @@ 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 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
+	 * @param $timestamps Array: pass an empty array to restore all revisions, otherwise list the ones to undelete.
+	 * @param $comment String
+	 * @param $unsuppress Boolean: remove all ar_deleted/fa_deleted restrictions of seletected revs
 	 *
-	 * @return mixed number of revisions restored or false on failure
+	 * @return Mixed: number of revisions restored or false on failure
 	 */
-	private function undeleteRevisions( $timestamps, $unsuppress = false ) {
-		if ( wfReadOnly() )
+	private function undeleteRevisions( $timestamps, $unsuppress = false, $comment = '' ) {
+		if ( wfReadOnly() ) {
 			return false;
+		}
 		$restoreAll = empty( $timestamps );
 
 		$dbw = wfGetDB( DB_MASTER );
 
 		# Does this page already exist? We'll have to update it...
-		$article = new Article( $this->title );
-		$options = 'FOR UPDATE';
+		$article = WikiPage::factory( $this->title );
+		# Load latest data for the current page (bug 31179)
+		$article->loadPageData( 'fromdbmaster' );
+		$oldcountable = $article->isCountable();
+
+		$options = 'FOR UPDATE'; // lock page
 		$page = $dbw->selectRow( 'page',
 			array( 'page_id', 'page_latest' ),
 			array( 'page_namespace' => $this->title->getNamespace(),
-			       'page_title'     => $this->title->getDBkey() ),
+				   'page_title'     => $this->title->getDBkey() ),
 			__METHOD__,
-			$options );
+			$options
+		);
 		if( $page ) {
 			$makepage = false;
 			# Page already exists. Import the history, and if necessary
@@ -442,38 +462,64 @@ class PageArchive {
 				'ar_text_id',
 				'ar_deleted',
 				'ar_page_id',
-				'ar_len' ),
+				'ar_len',
+				'ar_sha1' ),
 			/* 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 ) {
+			wfDebug( __METHOD__ . ": no revisions to restore\n" );
+			return false; // ???
+		}
+
+		$ret->seek( $rev_count - 1 ); // move to last
+		$row = $ret->fetchObject(); // get newest archived rev
+		$ret->seek( 0 ); // move back
 
 		if( $makepage ) {
+			// Check the state of the newest to-be version...
+			if( !$unsuppress && ( $row->ar_deleted & Revision::DELETED_TEXT ) ) {
+				return false; // we can't leave the current revision like this!
+			}
+			// Safe to insert now...
 			$newid  = $article->insertOn( $dbw );
 			$pageId = $newid;
+		} else {
+			// Check if a deleted revision will become the current revision...
+			if( $row->ar_timestamp > $previousTimestamp ) {
+				// Check the state of the newest to-be version...
+				if( !$unsuppress && ( $row->ar_deleted & Revision::DELETED_TEXT ) ) {
+					return false; // we can't leave the current revision like this!
+				}
+			}
 		}
 
 		$revision = null;
 		$restored = 0;
 
-		while( $row = $ret->fetchObject() ) {
+		foreach ( $ret as $row ) {
 			// Check for key dupes due to shitty archive integrity.
 			if( $row->ar_rev_id ) {
-				$exists = $dbw->selectField( 'revision', '1', array('rev_id' => $row->ar_rev_id), __METHOD__ );
-				if( $exists ) continue; // don't throw DB errors
+				$exists = $dbw->selectField( 'revision', '1',
+					array( 'rev_id' => $row->ar_rev_id ), __METHOD__ );
+				if( $exists ) {
+					continue; // don't throw DB errors
+				}
 			}
-
-			$revision = Revision::newFromArchiveRow( $row, 
-				array( 
-					'page' => $pageId, 
+			// Insert one revision at a time...maintaining deletion status
+			// unless we are specifically removing all restrictions...
+			$revision = Revision::newFromArchiveRow( $row,
+				array(
+					'page' => $pageId,
 					'deleted' => $unsuppress ? 0 : $row->ar_deleted
 				) );
-			
+
 			$revision->insertOn( $dbw );
 			$restored++;
 
@@ -486,99 +532,105 @@ class PageArchive {
 				'ar_title' => $this->title->getDBkey(),
 				$oldones ),
 			__METHOD__ );
-		
+
 		// Was anything restored at all?
-		if( $restored == 0 )
+		if ( $restored == 0 ) {
 			return 0;
+		}
 
-		if( $revision ) {
-			// Attach the latest revision to the page...
-			$wasnew = $article->updateIfNewerOn( $dbw, $revision, $previousRevId );
-			if( $newid || $wasnew ) {
-				// We don't handle well with top revision deleted
-				// FIXME: any sysop can unsuppress any revision by just undeleting it into a non-existent page!
-				if( $revision->getVisibility() ) {
-					$dbw->update( 'revision', 
-						array( 'rev_deleted' => 0 ),
-						array( 'rev_id' => $revision->getId() ),
-						__METHOD__
-					);
-					$revision->mDeleted = 0; // Don't pollute the parser cache
-				}
-				// Update site stats, link tables, etc
-				$article->createUpdates( $revision );
-			}
+		$created = (bool)$newid;
 
-			if( $newid ) {
-				wfRunHooks( 'ArticleUndelete', array( &$this->title, true ) );
-				Article::onArticleCreate( $this->title );
-			} else {
-				wfRunHooks( 'ArticleUndelete', array( &$this->title, false ) );
-				Article::onArticleEdit( $this->title );
-			}
+		// Attach the latest revision to the page...
+		$wasnew = $article->updateIfNewerOn( $dbw, $revision, $previousRevId );
+		if ( $created || $wasnew ) {
+			// Update site stats, link tables, etc
+			$user = User::newFromName( $revision->getRawUserText(), false );
+			$article->doEditUpdates( $revision, $user, array( 'created' => $created, 'oldcountable' => $oldcountable ) );
+		}
 
-			if( $this->title->getNamespace() == NS_FILE ) {
-				$update = new HTMLCacheUpdate( $this->title, 'imagelinks' );
-				$update->doUpdate();
-			}
-		} else {
-			// Revision couldn't be created. This is very weird
-			return self::UNDELETE_UNKNOWNERR;
+		wfRunHooks( 'ArticleUndelete', array( &$this->title, $created, $comment ) );
+
+		if( $this->title->getNamespace() == NS_FILE ) {
+			$update = new HTMLCacheUpdate( $this->title, 'imagelinks' );
+			$update->doUpdate();
 		}
 
 		return $restored;
 	}
 
+	/**
+	 * @return Status
+	 */
 	function getFileStatus() { return $this->fileStatus; }
 }
 
 /**
- * The HTML form for Special:Undelete, which allows users with the appropriate
- * permissions to view and restore deleted content.
+ * Special page allowing users with the appropriate permissions to view
+ * and restore deleted content.
+ *
  * @ingroup SpecialPage
  */
-class UndeleteForm {
-	var $mAction, $mTarget, $mTimestamp, $mRestore, $mInvert, $mTargetObj;
-	var $mTargetTimestamp, $mAllowed, $mComment, $mToken;
+class SpecialUndelete extends SpecialPage {
+	var $mAction, $mTarget, $mTimestamp, $mRestore, $mInvert, $mFilename;
+	var $mTargetTimestamp, $mAllowed, $mCanView, $mComment, $mToken;
+
+	/**
+	 * @var Title
+	 */
+	var $mTargetObj;
+
+	function __construct() {
+		parent::__construct( 'Undelete', 'deletedhistory' );
+	}
+
+	function loadRequest( $par ) {
+		$request = $this->getRequest();
+		$user = $this->getUser();
 
-	function UndeleteForm( $request, $par = "" ) {
-		global $wgUser;
 		$this->mAction = $request->getVal( 'action' );
-		$this->mTarget = $request->getVal( 'target' );
+		if ( $par !== null && $par !== '' ) {
+			$this->mTarget = $par;
+		} else {
+			$this->mTarget = $request->getVal( 'target' );
+		}
+		$this->mTargetObj = null;
+		if ( $this->mTarget !== null && $this->mTarget !== '' ) {
+			$this->mTargetObj = Title::newFromURL( $this->mTarget );
+		}
 		$this->mSearchPrefix = $request->getText( 'prefix' );
 		$time = $request->getVal( 'timestamp' );
 		$this->mTimestamp = $time ? wfTimestamp( TS_MW, $time ) : '';
-		$this->mFile = $request->getVal( 'file' );
+		$this->mFilename = $request->getVal( 'file' );
 
 		$posted = $request->wasPosted() &&
-			$wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
+			$user->matchEditToken( $request->getVal( 'wpEditToken' ) );
 		$this->mRestore = $request->getCheck( 'restore' ) && $posted;
 		$this->mInvert = $request->getCheck( 'invert' ) && $posted;
 		$this->mPreview = $request->getCheck( 'preview' ) && $posted;
 		$this->mDiff = $request->getCheck( 'diff' );
+		$this->mDiffOnly = $request->getBool( 'diffonly', $this->getUser()->getOption( 'diffonly' ) );
 		$this->mComment = $request->getText( 'wpComment' );
-		$this->mUnsuppress = $request->getVal( 'wpUnsuppress' ) && $wgUser->isAllowed( 'suppressrevision' );
+		$this->mUnsuppress = $request->getVal( 'wpUnsuppress' ) && $user->isAllowed( 'suppressrevision' );
 		$this->mToken = $request->getVal( 'token' );
 
-		if( $par != "" ) {
-			$this->mTarget = $par;
-		}
-		if ( $wgUser->isAllowed( 'undelete' ) && !$wgUser->isBlocked() ) {
-			$this->mAllowed = true;
-		} else {
+		if ( $user->isAllowed( 'undelete' ) && !$user->isBlocked() ) {
+			$this->mAllowed = true; // user can restore
+			$this->mCanView = true; // user can view content
+		} elseif ( $user->isAllowed( 'deletedtext' ) ) {
+			$this->mAllowed = false; // user cannot restore
+			$this->mCanView = true; // user can view content
+			$this->mRestore = false;
+		} else { // user can only view the list of revisions
 			$this->mAllowed = false;
+			$this->mCanView = false;
 			$this->mTimestamp = '';
 			$this->mRestore = false;
 		}
-		if ( $this->mTarget !== "" ) {
-			$this->mTargetObj = Title::newFromURL( $this->mTarget );
-		} else {
-			$this->mTargetObj = NULL;
-		}
+
 		if( $this->mRestore || $this->mInvert ) {
 			$timestamps = array();
 			$this->mFileVersions = array();
-			foreach( $_REQUEST as $key => $val ) {
+			foreach( $request->getValues() as $key => $val ) {
 				$matches = array();
 				if( preg_match( '/^ts(\d{14})$/', $key, $matches ) ) {
 					array_push( $timestamps, $matches[1] );
@@ -593,188 +645,215 @@ class UndeleteForm {
 		}
 	}
 
-	function execute() {
-		global $wgOut, $wgUser;
-		if ( $this->mAllowed ) {
-			$wgOut->setPagetitle( wfMsg( "undeletepage" ) );
-		} else {
-			$wgOut->setPagetitle( wfMsg( "viewdeletedpage" ) );
-		}
+	function execute( $par ) {
+		$this->checkPermissions();
+		$user = $this->getUser();
 
-		if( is_null( $this->mTargetObj ) ) {
-		# Not all users can just browse every deleted page from the list
-			if( $wgUser->isAllowed( 'browsearchive' ) ) {
-				$this->showSearchForm();
+		$this->setHeaders();
+		$this->outputHeader();
 
-				# List undeletable articles
-				if( $this->mSearchPrefix ) {
-					$result = PageArchive::listPagesByPrefix( $this->mSearchPrefix );
-					$this->showList( $result );
-				}
-			} else {
-				$wgOut->addWikiMsg( 'undelete-header' );
+		$this->loadRequest( $par );
+
+		$out = $this->getOutput();
+
+		if ( is_null( $this->mTargetObj ) ) {
+			$out->addWikiMsg( 'undelete-header' );
+
+			# Not all users can just browse every deleted page from the list
+			if ( $user->isAllowed( 'browsearchive' ) ) {
+				$this->showSearchForm();
 			}
 			return;
 		}
-		if( $this->mTimestamp !== '' ) {
-			return $this->showRevision( $this->mTimestamp );
+
+		if ( $this->mAllowed ) {
+			$out->setPageTitle( $this->msg( 'undeletepage' ) );
+		} else {
+			$out->setPageTitle( $this->msg( 'viewdeletedpage' ) );
 		}
-		if( $this->mFile !== null ) {
-			$file = new ArchivedFile( $this->mTargetObj, '', $this->mFile );
+
+		$this->getSkin()->setRelevantTitle( $this->mTargetObj );
+
+		if ( $this->mTimestamp !== '' ) {
+			$this->showRevision( $this->mTimestamp );
+		} elseif ( $this->mFilename !== null ) {
+			$file = new ArchivedFile( $this->mTargetObj, '', $this->mFilename );
 			// Check if user is allowed to see this file
-			if( !$file->userCan( File::DELETED_FILE ) ) {
-				$wgOut->permissionRequired( 'suppressrevision' );
-				return false;
-			} elseif ( !$wgUser->matchEditToken( $this->mToken, $this->mFile ) ) {
-				$this->showFileConfirmationForm( $this->mFile );
-				return false;
+			if ( !$file->exists() ) {
+				$out->addWikiMsg( 'filedelete-nofile', $this->mFilename );
+			} elseif ( !$file->userCan( File::DELETED_FILE, $user ) ) {
+				if( $file->isDeleted( File::DELETED_RESTRICTED ) ) {
+					throw new PermissionsError( 'suppressrevision' );
+				} else {
+					throw new PermissionsError( 'deletedtext' );
+				}
+			} elseif ( !$user->matchEditToken( $this->mToken, $this->mFilename ) ) {
+				$this->showFileConfirmationForm( $this->mFilename );
 			} else {
-				return $this->showFile( $this->mFile );
+				$this->showFile( $this->mFilename );
 			}
+		} elseif ( $this->mRestore && $this->mAction == 'submit' ) {
+			$this->undelete();
+		} else {
+			$this->showHistory();
 		}
-		if( $this->mRestore && $this->mAction == "submit" ) {
-			return $this->undelete();
-		}
-		if( $this->mInvert && $this->mAction == "submit" ) {
-			return $this->showHistory( );
-		}
-		return $this->showHistory();
 	}
 
 	function showSearchForm() {
-		global $wgOut, $wgScript;
-		$wgOut->addWikiMsg( 'undelete-header' );
+		global $wgScript;
 
-		$wgOut->addHTML(
+		$out = $this->getOutput();
+		$out->setPageTitle( $this->msg( 'undelete-search-title' ) );
+		$out->addHTML(
 			Xml::openElement( 'form', array(
 				'method' => 'get',
 				'action' => $wgScript ) ) .
-			Xml::fieldset( wfMsg( 'undelete-search-box' ) ) .
-			Xml::hidden( 'title',
-				SpecialPage::getTitleFor( 'Undelete' )->getPrefixedDbKey() ) .
-			Xml::inputLabel( wfMsg( 'undelete-search-prefix' ),
+			Xml::fieldset( $this->msg( 'undelete-search-box' )->text() ) .
+			Html::hidden( 'title',
+				$this->getTitle()->getPrefixedDbKey() ) .
+			Xml::inputLabel( $this->msg( 'undelete-search-prefix' )->text(),
 				'prefix', 'prefix', 20,
 				$this->mSearchPrefix ) . ' ' .
-			Xml::submitButton( wfMsg( 'undelete-search-submit' ) ) .
+			Xml::submitButton( $this->msg( 'undelete-search-submit' )->text() ) .
 			Xml::closeElement( 'fieldset' ) .
 			Xml::closeElement( 'form' )
 		);
+
+		# List undeletable articles
+		if( $this->mSearchPrefix ) {
+			$result = PageArchive::listPagesByPrefix( $this->mSearchPrefix );
+			$this->showList( $result );
+		}
 	}
 
-	// Generic list of deleted pages
+	/**
+	 * Generic list of deleted pages
+	 *
+	 * @param $result ResultWrapper
+	 * @return bool
+	 */
 	private function showList( $result ) {
-		global $wgLang, $wgContLang, $wgUser, $wgOut;
+		$out = $this->getOutput();
 
 		if( $result->numRows() == 0 ) {
-			$wgOut->addWikiMsg( 'undelete-no-results' );
+			$out->addWikiMsg( 'undelete-no-results' );
 			return;
 		}
 
-		$wgOut->addWikiMsg( 'undeletepagetext', $wgLang->formatNum( $result->numRows() ) );
+		$out->addWikiMsg( 'undeletepagetext', $this->getLanguage()->formatNum( $result->numRows() ) );
 
-		$sk = $wgUser->getSkin();
-		$undelete = SpecialPage::getTitleFor( 'Undelete' );
-		$wgOut->addHTML( "<ul>\n" );
-		while( $row = $result->fetchObject() ) {
+		$undelete = $this->getTitle();
+		$out->addHTML( "<ul>\n" );
+		foreach ( $result as $row ) {
 			$title = Title::makeTitleSafe( $row->ar_namespace, $row->ar_title );
-			$link = $sk->linkKnown(
+			$link = Linker::linkKnown(
 				$undelete,
 				htmlspecialchars( $title->getPrefixedText() ),
 				array(),
 				array( 'target' => $title->getPrefixedText() )
 			);
-			$revs = wfMsgExt( 'undeleterevisions',
-				array( 'parseinline' ),
-				$wgLang->formatNum( $row->count ) );
-			$wgOut->addHTML( "<li>{$link} ({$revs})</li>\n" );
+			$revs = $this->msg( 'undeleterevisions' )->numParams( $row->count )->parse();
+			$out->addHTML( "<li>{$link} ({$revs})</li>\n" );
 		}
 		$result->free();
-		$wgOut->addHTML( "</ul>\n" );
+		$out->addHTML( "</ul>\n" );
 
 		return true;
 	}
 
 	private function showRevision( $timestamp ) {
-		global $wgLang, $wgUser, $wgOut;
-		$self = SpecialPage::getTitleFor( 'Undelete' );
-		$skin = $wgUser->getSkin();
-
-		if(!preg_match("/[0-9]{14}/",$timestamp)) return 0;
+		if( !preg_match( '/[0-9]{14}/', $timestamp ) ) {
+			return 0;
+		}
 
 		$archive = new PageArchive( $this->mTargetObj );
+		wfRunHooks( 'UndeleteForm::showRevision', array( &$archive, $this->mTargetObj ) );
 		$rev = $archive->getRevision( $timestamp );
 
+		$out = $this->getOutput();
+		$user = $this->getUser();
+
 		if( !$rev ) {
-			$wgOut->addWikiMsg( 'undeleterevision-missing' );
+			$out->addWikiMsg( 'undeleterevision-missing' );
 			return;
 		}
 
-		if( $rev->isDeleted(Revision::DELETED_TEXT) ) {
-			if( !$rev->userCan(Revision::DELETED_TEXT) ) {
-				$wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", 'rev-deleted-text-permission' );
+		if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+			if( !$rev->userCan( Revision::DELETED_TEXT, $user ) ) {
+				$out->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n", 'rev-deleted-text-permission' );
 				return;
 			} else {
-				$wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", 'rev-deleted-text-view' );
-				$wgOut->addHTML( '<br/>' );
+				$out->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n", 'rev-deleted-text-view' );
+				$out->addHTML( '<br />' );
 				// and we are allowed to see...
 			}
 		}
 
-		$wgOut->setPageTitle( wfMsg( 'undeletepage' ) );
-
-		$link = $skin->linkKnown(
-			SpecialPage::getTitleFor( 'Undelete', $this->mTargetObj->getPrefixedDBkey() ),
-			htmlspecialchars( $this->mTargetObj->getPrefixedText() )
-		);
-
 		if( $this->mDiff ) {
 			$previousRev = $archive->getPreviousRevision( $timestamp );
 			if( $previousRev ) {
 				$this->showDiff( $previousRev, $rev );
-				if( $wgUser->getOption( 'diffonly' ) ) {
+				if( $this->mDiffOnly ) {
 					return;
 				} else {
-					$wgOut->addHTML( '<hr />' );
+					$out->addHTML( '<hr />' );
 				}
 			} else {
-				$wgOut->addWikiMsg( 'undelete-nodiff' );
+				$out->addWikiMsg( 'undelete-nodiff' );
 			}
 		}
 
+		$link = Linker::linkKnown(
+			$this->getTitle( $this->mTargetObj->getPrefixedDBkey() ),
+			htmlspecialchars( $this->mTargetObj->getPrefixedText() )
+		);
+
+		$lang = $this->getLanguage();
+
 		// date and time are separate parameters to facilitate localisation.
 		// $time is kept for backward compat reasons.
-		$time = htmlspecialchars( $wgLang->timeAndDate( $timestamp, true ) );
-		$d = htmlspecialchars( $wgLang->date( $timestamp, true ) );
-		$t = htmlspecialchars( $wgLang->time( $timestamp, true ) );
-		$user = $skin->revUserTools( $rev );
+		$time = $lang->userTimeAndDate( $timestamp, $user );
+		$d = $lang->userDate( $timestamp, $user );
+		$t = $lang->userTime( $timestamp, $user );
+		$userLink = Linker::revUserTools( $rev );
 
 		if( $this->mPreview ) {
 			$openDiv = '<div id="mw-undelete-revision" class="mw-warning">';
 		} else {
 			$openDiv = '<div id="mw-undelete-revision">';
 		}
+		$out->addHTML( $openDiv );
 
-		$wgOut->addHTML( $openDiv . wfMsgWikiHtml( 'undelete-revision', $link, $time, $user, $d, $t ) . '</div>' );
+		// Revision delete links
+		if ( !$this->mDiff ) {
+			$revdel = Linker::getRevDeleteLink( $user, $rev, $this->mTargetObj );
+			if ( $revdel ) {
+				$out->addHTML( "$revdel " );
+			}
+		}
+
+		$out->addHTML( $this->msg( 'undelete-revision' )->rawParams( $link )->params(
+			$time )->rawParams( $userLink )->params( $d, $t )->parse() . '</div>' );
 		wfRunHooks( 'UndeleteShowRevision', array( $this->mTargetObj, $rev ) );
 
 		if( $this->mPreview ) {
-			//Hide [edit]s
-			$popts = $wgOut->parserOptions();
+			// Hide [edit]s
+			$popts = $out->parserOptions();
 			$popts->setEditSection( false );
-			$wgOut->parserOptions( $popts );
-			$wgOut->addWikiTextTitleTidy( $rev->getText( Revision::FOR_THIS_USER ), $this->mTargetObj, true );
+			$out->parserOptions( $popts );
+			$out->addWikiTextTitleTidy( $rev->getText( Revision::FOR_THIS_USER, $user ), $this->mTargetObj, true );
 		}
 
-		$wgOut->addHTML(
+		$out->addHTML(
 			Xml::element( 'textarea', array(
 					'readonly' => 'readonly',
-					'cols' => intval( $wgUser->getOption( 'cols' ) ),
-					'rows' => intval( $wgUser->getOption( 'rows' ) ) ),
-				$rev->getText( Revision::FOR_THIS_USER ) . "\n" ) .
+					'cols' => intval( $user->getOption( 'cols' ) ),
+					'rows' => intval( $user->getOption( 'rows' ) ) ),
+				$rev->getText( Revision::FOR_THIS_USER, $user ) . "\n" ) .
 			Xml::openElement( 'div' ) .
 			Xml::openElement( 'form', array(
 				'method' => 'post',
-				'action' => $self->getLocalURL( array( 'action' => 'submit' ) ) ) ) .
+				'action' => $this->getTitle()->getLocalURL( array( 'action' => 'submit' ) ) ) ) .
 			Xml::element( 'input', array(
 				'type' => 'hidden',
 				'name' => 'target',
@@ -786,15 +865,15 @@ class UndeleteForm {
 			Xml::element( 'input', array(
 				'type' => 'hidden',
 				'name' => 'wpEditToken',
-				'value' => $wgUser->editToken() ) ) .
+				'value' => $user->getEditToken() ) ) .
 			Xml::element( 'input', array(
 				'type' => 'submit',
 				'name' => 'preview',
-				'value' => wfMsg( 'showpreview' ) ) ) .
+				'value' => $this->msg( 'showpreview' )->text() ) ) .
 			Xml::element( 'input', array(
 				'name' => 'diff',
 				'type' => 'submit',
-				'value' => wfMsg( 'showdiff' ) ) ) .
+				'value' => $this->msg( 'showdiff' )->text() ) ) .
 			Xml::closeElement( 'form' ) .
 			Xml::closeElement( 'div' ) );
 	}
@@ -802,16 +881,15 @@ class UndeleteForm {
 	/**
 	 * Build a diff display between this and the previous either deleted
 	 * or non-deleted edit.
-	 * @param Revision $previousRev
-	 * @param Revision $currentRev
-	 * @return string HTML
+	 *
+	 * @param $previousRev Revision
+	 * @param $currentRev Revision
+	 * @return String: HTML
 	 */
 	function showDiff( $previousRev, $currentRev ) {
-		global $wgOut;
-
-		$diffEngine = new DifferenceEngine();
+		$diffEngine = new DifferenceEngine( $this->getContext() );
 		$diffEngine->showDiffStyle();
-		$wgOut->addHTML(
+		$this->getOutput()->addHTML(
 			"<div>" .
 			"<table border='0' width='98%' cellpadding='0' cellspacing='4' class='diff'>" .
 			"<col class='diff-marker' />" .
@@ -829,63 +907,53 @@ class UndeleteForm {
 			$diffEngine->generateDiffBody(
 				$previousRev->getText(), $currentRev->getText() ) .
 			"</table>" .
-			"</div>\n" );
-
+			"</div>\n"
+		);
 	}
 
+	/**
+	 * @param $rev Revision
+	 * @param $prefix
+	 * @return string
+	 */
 	private function diffHeader( $rev, $prefix ) {
-		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' );
+			/// @todo FIXME: $rev->getTitle() is null for deleted revs...?
+			$targetPage = $this->getTitle();
 			$targetQuery = array(
 				'target' => $this->mTargetObj->getPrefixedText(),
 				'timestamp' => wfTimestamp( TS_MW, $rev->getTimestamp() )
 			);
 		} else {
-			/// @fixme getId() may return non-zero for deleted revs...
+			/// @todo FIXME: getId() may return non-zero for deleted revs...
 			$targetPage = $rev->getTitle();
 			$targetQuery = array( 'oldid' => $rev->getId() );
 		}
-		// Add show/hide link if available
-		if( $wgUser->isAllowed( 'deleterevision' ) ) {
-			// If revision was hidden from sysops
-			if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
-				$del = ' ' . Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ),
-					'(' . wfMsgHtml('rev-delundel') . ')' );
-			// Otherwise, show the link...
-			} else {
-				$query = array( 
-					'type' => 'archive',
-					'target' => $this->mTargetObj->getPrefixedDbkey(),
-					'ids' => $rev->getTimestamp() );
-				$del = ' ' . $sk->revDeleteLink( $query,
-					$rev->isDeleted( Revision::DELETED_RESTRICTED ) );
-			}
-		} else {
-			$del = '';
-		}
+		// Add show/hide deletion links if available
+		$user = $this->getUser();
+		$lang = $this->getLanguage();
+		$rdel = Linker::getRevDeleteLink( $user, $rev, $this->mTargetObj );
+		if ( $rdel ) $rdel = " $rdel";
 		return
-			'<div id="mw-diff-'.$prefix.'title1"><strong>' .
-				$sk->link(
+			'<div id="mw-diff-' . $prefix . 'title1"><strong>' .
+				Linker::link(
 					$targetPage,
-					wfMsgHtml(
+					$this->msg(
 						'revisionasof',
-						htmlspecialchars( $wgLang->timeanddate( $rev->getTimestamp(), true ) ),
-						htmlspecialchars( $wgLang->date( $rev->getTimestamp(), true ) ),
-						htmlspecialchars( $wgLang->time( $rev->getTimestamp(), true ) )
-					),
+						$lang->userTimeAndDate( $rev->getTimestamp(), $user ),
+						$lang->userDate( $rev->getTimestamp(), $user ),
+						$lang->userTime( $rev->getTimestamp(), $user )
+					)->escaped(),
 					array(),
 					$targetQuery
 				) .
 			'</strong></div>' .
 			'<div id="mw-diff-'.$prefix.'title2">' .
-				$sk->revUserTools( $rev ) . '<br/>' .
+				Linker::revUserTools( $rev ) . '<br />' .
 			'</div>' .
 			'<div id="mw-diff-'.$prefix.'title3">' .
-				$sk->revComment( $rev ) . $del . '<br/>' .
+				Linker::revComment( $rev ) . $rdel . '<br />' .
 			'</div>';
 	}
 
@@ -893,22 +961,24 @@ class UndeleteForm {
 	 * Show a form confirming whether a tokenless user really wants to see a file
 	 */
 	private function showFileConfirmationForm( $key ) {
-		global $wgOut, $wgUser, $wgLang;
-		$file = new ArchivedFile( $this->mTargetObj, '', $this->mFile );
-		$wgOut->addWikiMsg( 'undelete-show-file-confirm',
+		$out = $this->getOutput();
+		$lang = $this->getLanguage();
+		$user = $this->getUser();
+		$file = new ArchivedFile( $this->mTargetObj, '', $this->mFilename );
+		$out->addWikiMsg( 'undelete-show-file-confirm',
 			$this->mTargetObj->getText(),
-			$wgLang->date( $file->getTimestamp() ),
-			$wgLang->time( $file->getTimestamp() ) );
-		$wgOut->addHTML( 
-			Xml::openElement( 'form', array( 
+			$lang->userDate( $file->getTimestamp(), $user ),
+			$lang->userTime( $file->getTimestamp(), $user ) );
+		$out->addHTML(
+			Xml::openElement( 'form', array(
 				'method' => 'POST',
-				'action' => SpecialPage::getTitleFor( 'Undelete' )->getLocalUrl(
+				'action' => $this->getTitle()->getLocalURL(
 					'target=' . urlencode( $this->mTarget ) .
 					'&file=' . urlencode( $key ) .
-					'&token=' . urlencode( $wgUser->editToken( $key ) ) )
+					'&token=' . urlencode( $user->getEditToken( $key ) ) )
 				)
 			) .
-			Xml::submitButton( wfMsg( 'undelete-show-file-submit' ) ) .
+			Xml::submitButton( $this->msg( 'undelete-show-file-submit' )->text() ) .
 			'</form>'
 		);
 	}
@@ -917,52 +987,49 @@ class UndeleteForm {
 	 * Show a deleted file version requested by the visitor.
 	 */
 	private function showFile( $key ) {
-		global $wgOut, $wgRequest;
-		$wgOut->disable();
+		$this->getOutput()->disable();
 
 		# We mustn't allow the output to be Squid cached, otherwise
 		# if an admin previews a deleted image, and it's cached, then
 		# a user without appropriate permissions can toddle off and
 		# nab the image, and Squid will serve it
-		$wgRequest->response()->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' );
-		$wgRequest->response()->header( 'Cache-Control: no-cache, no-store, max-age=0, must-revalidate' );
-		$wgRequest->response()->header( 'Pragma: no-cache' );
+		$response = $this->getRequest()->response();
+		$response->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' );
+		$response->header( 'Cache-Control: no-cache, no-store, max-age=0, must-revalidate' );
+		$response->header( 'Pragma: no-cache' );
 
-		global $IP;
-		require_once( "$IP/includes/StreamFile.php" );
-		$repo = RepoGroup::singleton()->getLocalRepo();		
+		$repo = RepoGroup::singleton()->getLocalRepo();
 		$path = $repo->getZonePath( 'deleted' ) . '/' . $repo->getDeletedHashPath( $key ) . $key;
-		wfStreamFile( $path );
+		$repo->streamFile( $path );
 	}
 
-	private function showHistory( ) {
-		global $wgLang, $wgUser, $wgOut;
-
-		$sk = $wgUser->getSkin();
+	private function showHistory() {
+		$out = $this->getOutput();
 		if( $this->mAllowed ) {
-			$wgOut->setPagetitle( wfMsg( "undeletepage" ) );
-		} else {
-			$wgOut->setPagetitle( wfMsg( 'viewdeletedpage' ) );
+			$out->addModules( 'mediawiki.special.undelete' );
 		}
-
-		$wgOut->wrapWikiMsg(  "<div class='mw-undelete-pagetitle'>\n$1</div>\n", array ( 'undeletepagetitle', $this->mTargetObj->getPrefixedText() ) );
+		$out->wrapWikiMsg(
+			"<div class='mw-undelete-pagetitle'>\n$1\n</div>\n",
+			array( 'undeletepagetitle', $this->mTargetObj->getPrefixedText() )
+		);
 
 		$archive = new PageArchive( $this->mTargetObj );
+		wfRunHooks( 'UndeleteForm::showHistory', array( &$archive, $this->mTargetObj ) );
 		/*
 		$text = $archive->getLastRevisionText();
 		if( is_null( $text ) ) {
-			$wgOut->addWikiMsg( "nohistory" );
+			$out->addWikiMsg( 'nohistory' );
 			return;
 		}
 		*/
-		$wgOut->addHTML( '<div class="mw-undelete-history">' );
+		$out->addHTML( '<div class="mw-undelete-history">' );
 		if ( $this->mAllowed ) {
-			$wgOut->addWikiMsg( "undeletehistory" );
-			$wgOut->addWikiMsg( "undeleterevdel" );
+			$out->addWikiMsg( 'undeletehistory' );
+			$out->addWikiMsg( 'undeleterevdel' );
 		} else {
-			$wgOut->addWikiMsg( "undeletehistorynoadmin" );
+			$out->addWikiMsg( 'undeletehistorynoadmin' );
 		}
-		$wgOut->addHTML( '</div>' );
+		$out->addHTML( '</div>' );
 
 		# List all stored revisions
 		$revisions = $archive->listRevisions();
@@ -974,7 +1041,7 @@ class UndeleteForm {
 		# Batch existence check on user and talk pages
 		if( $haveRevisions ) {
 			$batch = new LinkBatch();
-			while( $row = $revisions->fetchObject() ) {
+			foreach ( $revisions as $row ) {
 				$batch->addObj( Title::makeTitleSafe( NS_USER, $row->ar_user_text ) );
 				$batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->ar_user_text ) );
 			}
@@ -983,7 +1050,7 @@ class UndeleteForm {
 		}
 		if( $haveFiles ) {
 			$batch = new LinkBatch();
-			while( $row = $files->fetchObject() ) {
+			foreach ( $files as $row ) {
 				$batch->addObj( Title::makeTitleSafe( NS_USER, $row->fa_user_text ) );
 				$batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->fa_user_text ) );
 			}
@@ -992,134 +1059,137 @@ class UndeleteForm {
 		}
 
 		if ( $this->mAllowed ) {
-			$titleObj = SpecialPage::getTitleFor( "Undelete" );
-			$action = $titleObj->getLocalURL( array( 'action' => 'submit' ) );
+			$action = $this->getTitle()->getLocalURL( array( 'action' => 'submit' ) );
 			# Start the form here
 			$top = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'undelete' ) );
-			$wgOut->addHTML( $top );
+			$out->addHTML( $top );
 		}
 
 		# Show relevant lines from the deletion log:
-		$wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) . "\n" );
-		LogEventsList::showLogExtract( $wgOut, 'delete', $this->mTargetObj->getPrefixedText() );
+		$out->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) . "\n" );
+		LogEventsList::showLogExtract( $out, 'delete', $this->mTargetObj );
 		# Show relevant lines from the suppression log:
-		if( $wgUser->isAllowed( 'suppressionlog' ) ) {
-			$wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'suppress' ) ) . "\n" );
-			LogEventsList::showLogExtract( $wgOut, 'suppress', $this->mTargetObj->getPrefixedText() );
+		if( $this->getUser()->isAllowed( 'suppressionlog' ) ) {
+			$out->addHTML( Xml::element( 'h2', null, LogPage::logName( 'suppress' ) ) . "\n" );
+			LogEventsList::showLogExtract( $out, 'suppress', $this->mTargetObj );
 		}
 
 		if( $this->mAllowed && ( $haveRevisions || $haveFiles ) ) {
 			# Format the user-visible controls (comment field, submission button)
 			# in a nice little table
-			if( $wgUser->isAllowed( 'suppressrevision' ) ) {
+			if( $this->getUser()->isAllowed( 'suppressrevision' ) ) {
 				$unsuppressBox =
 					"<tr>
-						<td>&nbsp;</td>
+						<td>&#160;</td>
 						<td class='mw-input'>" .
-							Xml::checkLabel( wfMsg('revdelete-unsuppress'), 'wpUnsuppress',
-								'mw-undelete-unsuppress', $this->mUnsuppress ).
+							Xml::checkLabel( $this->msg( 'revdelete-unsuppress' )->text(),
+								'wpUnsuppress', 'mw-undelete-unsuppress', $this->mUnsuppress ).
 						"</td>
 					</tr>";
 			} else {
-				$unsuppressBox = "";
+				$unsuppressBox = '';
 			}
 			$table =
-				Xml::fieldset( wfMsg( 'undelete-fieldset-title' ) ) .
+				Xml::fieldset( $this->msg( 'undelete-fieldset-title' )->text() ) .
 				Xml::openElement( 'table', array( 'id' => 'mw-undelete-table' ) ) .
 					"<tr>
 						<td colspan='2' class='mw-undelete-extrahelp'>" .
-							wfMsgWikiHtml( 'undeleteextrahelp' ) .
+							$this->msg( 'undeleteextrahelp' )->parseAsBlock() .
 						"</td>
 					</tr>
 					<tr>
 						<td class='mw-label'>" .
-							Xml::label( wfMsg( 'undeletecomment' ), 'wpComment' ) .
+							Xml::label( $this->msg( 'undeletecomment' )->text(), 'wpComment' ) .
 						"</td>
 						<td class='mw-input'>" .
 							Xml::input( 'wpComment', 50, $this->mComment, array( 'id' =>  'wpComment' ) ) .
 						"</td>
 					</tr>
 					<tr>
-						<td>&nbsp;</td>
+						<td>&#160;</td>
 						<td class='mw-submit'>" .
-							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::submitButton( wfMsg( 'undeleteinvert' ), array( 'name' => 'invert', 'id' => 'mw-undelete-invert' ) ) .
+							Xml::submitButton( $this->msg( 'undeletebtn' )->text(), array( 'name' => 'restore', 'id' => 'mw-undelete-submit' ) ) . ' ' .
+							Xml::submitButton( $this->msg( 'undeleteinvert' )->text(), array( 'name' => 'invert', 'id' => 'mw-undelete-invert' ) ) .
 						"</td>
 					</tr>" .
 					$unsuppressBox .
 				Xml::closeElement( 'table' ) .
 				Xml::closeElement( 'fieldset' );
 
-			$wgOut->addHTML( $table );
+			$out->addHTML( $table );
 		}
 
-		$wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'history' ) ) . "\n" );
+		$out->addHTML( Xml::element( 'h2', null, $this->msg( 'history' )->text() ) . "\n" );
 
 		if( $haveRevisions ) {
 			# The page's stored (deleted) history:
-			$wgOut->addHTML("<ul>");
-			$target = urlencode( $this->mTarget );
+			$out->addHTML( '<ul>' );
 			$remaining = $revisions->numRows();
 			$earliestLiveTime = $this->mTargetObj->getEarliestRevTime();
 
-			while( $row = $revisions->fetchObject() ) {
+			foreach ( $revisions as $row ) {
 				$remaining--;
-				$wgOut->addHTML( $this->formatRevisionRow( $row, $earliestLiveTime, $remaining, $sk ) );
+				$out->addHTML( $this->formatRevisionRow( $row, $earliestLiveTime, $remaining ) );
 			}
 			$revisions->free();
-			$wgOut->addHTML("</ul>");
+			$out->addHTML( '</ul>' );
 		} else {
-			$wgOut->addWikiMsg( "nohistory" );
+			$out->addWikiMsg( 'nohistory' );
 		}
 
 		if( $haveFiles ) {
-			$wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'filehist' ) ) . "\n" );
-			$wgOut->addHTML( "<ul>" );
-			while( $row = $files->fetchObject() ) {
-				$wgOut->addHTML( $this->formatFileRow( $row, $sk ) );
+			$out->addHTML( Xml::element( 'h2', null, $this->msg( 'filehist' )->text() ) . "\n" );
+			$out->addHTML( '<ul>' );
+			foreach ( $files as $row ) {
+				$out->addHTML( $this->formatFileRow( $row ) );
 			}
 			$files->free();
-			$wgOut->addHTML( "</ul>" );
+			$out->addHTML( '</ul>' );
 		}
 
 		if ( $this->mAllowed ) {
 			# Slip in the hidden controls here
-			$misc  = Xml::hidden( 'target', $this->mTarget );
-			$misc .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
+			$misc  = Html::hidden( 'target', $this->mTarget );
+			$misc .= Html::hidden( 'wpEditToken', $this->getUser()->getEditToken() );
 			$misc .= Xml::closeElement( 'form' );
-			$wgOut->addHTML( $misc );
+			$out->addHTML( $misc );
 		}
 
 		return true;
 	}
 
-	private function formatRevisionRow( $row, $earliestLiveTime, $remaining, $sk ) {
-		global $wgUser, $wgLang;
-
-		$rev = Revision::newFromArchiveRow( $row, 
+	private function formatRevisionRow( $row, $earliestLiveTime, $remaining ) {
+		$rev = Revision::newFromArchiveRow( $row,
 			array( 'page' => $this->mTargetObj->getArticleId() ) );
 		$stxt = '';
 		$ts = wfTimestamp( TS_MW, $row->ar_timestamp );
+		// Build checkboxen...
 		if( $this->mAllowed ) {
-			if( $this->mInvert){
+			if( $this->mInvert ) {
 				if( in_array( $ts, $this->mTargetTimestamp ) ) {
-					$checkBox = Xml::check( "ts$ts");
+					$checkBox = Xml::check( "ts$ts" );
 				} else {
 					$checkBox = Xml::check( "ts$ts", true );
 				}
 			} else {
 				$checkBox = Xml::check( "ts$ts" );
 			}
-			$titleObj = SpecialPage::getTitleFor( "Undelete" );
-			$pageLink = $this->getPageLink( $rev, $titleObj, $ts, $sk );
+		} else {
+			$checkBox = '';
+		}
+		$user = $this->getUser();
+		// Build page & diff links...
+		if( $this->mCanView ) {
+			$titleObj = $this->getTitle();
 			# Last link
-			if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
-				$last = wfMsgHtml('diff');
-			} else if( $remaining > 0 || ($earliestLiveTime && $ts > $earliestLiveTime) ) {
-				$last = $sk->linkKnown(
+			if( !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
+				$pageLink = htmlspecialchars( $this->getLanguage()->userTimeAndDate( $ts, $user ) );
+				$last = $this->msg( 'diff' )->escaped();
+			} elseif( $remaining > 0 || ( $earliestLiveTime && $ts > $earliestLiveTime ) ) {
+				$pageLink = $this->getPageLink( $rev, $titleObj, $ts );
+				$last = Linker::linkKnown(
 					$titleObj,
-					wfMsgHtml('diff'),
+					$this->msg( 'diff' )->escaped(),
 					array(),
 					array(
 						'target' => $this->mTargetObj->getPrefixedText(),
@@ -1128,201 +1198,209 @@ class UndeleteForm {
 					)
 				);
 			} else {
-				$last = wfMsgHtml('diff');
+				$pageLink = $this->getPageLink( $rev, $titleObj, $ts );
+				$last = $this->msg( 'diff' )->escaped();
 			}
 		} else {
-			$checkBox = '';
-			$pageLink = htmlspecialchars( $wgLang->timeanddate( $ts, true ) );
-			$last = wfMsgHtml('diff');
+			$pageLink = htmlspecialchars( $this->getLanguage()->userTimeAndDate( $ts, $user ) );
+			$last = $this->msg( 'diff' )->escaped();
 		}
-		$userLink = $sk->revUserTools( $rev );
-
-		if(!is_null($size = $row->ar_len)) {
-			$stxt = $sk->formatRevisionSize( $size );
+		// User links
+		$userLink = Linker::revUserTools( $rev );
+		// Revision text size
+		$size = $row->ar_len;
+		if( !is_null( $size ) ) {
+			$stxt = Linker::formatRevisionSize( $size );
 		}
-		$comment = $sk->revComment( $rev );
-		$revdlink = '';
-		if( $wgUser->isAllowed( 'deleterevision' ) ) {
-			if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
-			// If revision was hidden from sysops
-				$revdlink = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ),
-					'('.wfMsgHtml('rev-delundel').')' );
-			} else {
-				$query = array(
-					'type' => 'archive',
-					'target' => $this->mTargetObj->getPrefixedDBkey(),
-					'ids' => $ts
-				);
-				$revdlink = $sk->revDeleteLink( $query, $rev->isDeleted( Revision::DELETED_RESTRICTED ) );
-			}
-		}
-
+		// Edit summary
+		$comment = Linker::revComment( $rev );
+		// Revision delete links
+		$revdlink = Linker::getRevDeleteLink( $user, $rev, $this->mTargetObj );
 		return "<li>$checkBox $revdlink ($last) $pageLink . . $userLink $stxt $comment</li>";
 	}
 
-	private function formatFileRow( $row, $sk ) {
-		global $wgUser, $wgLang;
-
+	private function formatFileRow( $row ) {
 		$file = ArchivedFile::newFromRow( $row );
 
 		$ts = wfTimestamp( TS_MW, $row->fa_timestamp );
+		$user = $this->getUser();
 		if( $this->mAllowed && $row->fa_storage_key ) {
-			$checkBox = Xml::check( "fileid" . $row->fa_id );
+			$checkBox = Xml::check( 'fileid' . $row->fa_id );
 			$key = urlencode( $row->fa_storage_key );
-			$target = urlencode( $this->mTarget );
-			$titleObj = SpecialPage::getTitleFor( "Undelete" );
-			$pageLink = $this->getFileLink( $file, $titleObj, $ts, $key, $sk );
+			$pageLink = $this->getFileLink( $file, $this->getTitle(), $ts, $key );
 		} else {
 			$checkBox = '';
-			$pageLink = $wgLang->timeanddate( $ts, true );
+			$pageLink = $this->getLanguage()->userTimeAndDate( $ts, $user );
 		}
- 		$userLink = $this->getFileUser( $file, $sk );
-		$data =
-			wfMsg( 'widthheight',
-				$wgLang->formatNum( $row->fa_width ),
-				$wgLang->formatNum( $row->fa_height ) ) .
-			' (' .
-			wfMsg( 'nbytes', $wgLang->formatNum( $row->fa_size ) ) .
-			')';
-		$data = htmlspecialchars( $data );
-		$comment = $this->getFileComment( $file, $sk );
-		$revdlink = '';
-		if( $wgUser->isAllowed( 'deleterevision' ) ) {
-			if( !$file->userCan(File::DELETED_RESTRICTED ) ) {
-			// If revision was hidden from sysops
-				$revdlink = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.wfMsgHtml('rev-delundel').')' );
+		$userLink = $this->getFileUser( $file );
+		$data = $this->msg( 'widthheight' )->numParams( $row->fa_width, $row->fa_height )->text();
+		$bytes = $this->msg( 'parentheses' )->rawParams( $this->msg( 'nbytes' )->numParams( $row->fa_size )->text() )->plain();
+		$data = htmlspecialchars( $data . ' ' . $bytes );
+		$comment = $this->getFileComment( $file );
+
+		// Add show/hide deletion links if available
+		$canHide = $user->isAllowed( 'deleterevision' );
+		if( $canHide || ( $file->getVisibility() && $user->isAllowed( 'deletedhistory' ) ) ) {
+			if( !$file->userCan( File::DELETED_RESTRICTED, $user ) ) {
+				$revdlink = Linker::revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
 			} else {
 				$query = array(
 					'type' => 'filearchive',
 					'target' => $this->mTargetObj->getPrefixedDBkey(),
 					'ids' => $row->fa_id
 				);
-				$revdlink = $sk->revDeleteLink( $query, $file->isDeleted( File::DELETED_RESTRICTED ) );
+				$revdlink = Linker::revDeleteLink( $query,
+					$file->isDeleted( File::DELETED_RESTRICTED ), $canHide );
 			}
+		} else {
+			$revdlink = '';
 		}
+
 		return "<li>$checkBox $revdlink $pageLink . . $userLink $data $comment</li>\n";
 	}
 
 	/**
 	 * Fetch revision text link if it's available to all users
+	 *
+	 * @param $rev Revision
+	 * @param $titleObj Title
+	 * @param $ts string Timestamp
 	 * @return string
 	 */
-	function getPageLink( $rev, $titleObj, $ts, $sk ) {
-		global $wgLang;
+	function getPageLink( $rev, $titleObj, $ts ) {
+		$user = $this->getUser();
+		$time = $this->getLanguage()->userTimeAndDate( $ts, $user );
 
-		$time = htmlspecialchars( $wgLang->timeanddate( $ts, true ) );
-
-		if( !$rev->userCan(Revision::DELETED_TEXT) ) {
+		if( !$rev->userCan( Revision::DELETED_TEXT, $user ) ) {
 			return '<span class="history-deleted">' . $time . '</span>';
 		} else {
-			$link = $sk->linkKnown(
+			$link = Linker::linkKnown(
 				$titleObj,
-				$time,
+				htmlspecialchars( $time ),
 				array(),
 				array(
 					'target' => $this->mTargetObj->getPrefixedText(),
 					'timestamp' => $ts
 				)
 			);
-			if( $rev->isDeleted(Revision::DELETED_TEXT) )
+			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
+	 *
+	 * @param $file File
+	 * @param $titleObj Title
+	 * @param $ts string A timestamp
+	 * @param $key String: a storage key
+	 *
+	 * @return String: HTML fragment
 	 */
-	function getFileLink( $file, $titleObj, $ts, $key, $sk ) {
-		global $wgLang, $wgUser;
+	function getFileLink( $file, $titleObj, $ts, $key ) {
+		$user = $this->getUser();
+		$time = $this->getLanguage()->userTimeAndDate( $ts, $user );
 
-		if( !$file->userCan(File::DELETED_FILE) ) {
-			return '<span class="history-deleted">' . $wgLang->timeanddate( $ts, true ) . '</span>';
+		if( !$file->userCan( File::DELETED_FILE, $user ) ) {
+			return '<span class="history-deleted">' . $time . '</span>';
 		} else {
-			$link = $sk->linkKnown(
+			$link = Linker::linkKnown(
 				$titleObj,
-				$wgLang->timeanddate( $ts, true ),
+				htmlspecialchars( $time ),
 				array(),
 				array(
 					'target' => $this->mTargetObj->getPrefixedText(),
 					'file' => $key,
-					'token' => $wgUser->editToken( $key )
+					'token' => $user->getEditToken( $key )
 				)
 			);
-			if( $file->isDeleted(File::DELETED_FILE) )
+			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
+	 *
+	 * @param $file File
+	 * @return String: HTML fragment
 	 */
-	function getFileUser( $file, $sk ) {
-		if( !$file->userCan(File::DELETED_USER) ) {
-			return '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
+	function getFileUser( $file ) {
+		if( !$file->userCan( File::DELETED_USER, $this->getUser() ) ) {
+			return '<span class="history-deleted">' . $this->msg( 'rev-deleted-user' )->escaped() . '</span>';
 		} else {
-			$link = $sk->userLink( $file->getRawUser(), $file->getRawUserText() ) .
-				$sk->userToolLinks( $file->getRawUser(), $file->getRawUserText() );
-			if( $file->isDeleted(File::DELETED_USER) )
+			$link = Linker::userLink( $file->getRawUser(), $file->getRawUserText() ) .
+				Linker::userToolLinks( $file->getRawUser(), $file->getRawUserText() );
+			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
+	 *
+	 * @param $file File
+	 * @return String: HTML fragment
 	 */
-	function getFileComment( $file, $sk ) {
-		if( !$file->userCan(File::DELETED_COMMENT) ) {
-			return '<span class="history-deleted"><span class="comment">' . wfMsgHtml( 'rev-deleted-comment' ) . '</span></span>';
+	function getFileComment( $file ) {
+		if( !$file->userCan( File::DELETED_COMMENT, $this->getUser() ) ) {
+			return '<span class="history-deleted"><span class="comment">' .
+				$this->msg( 'rev-deleted-comment' )->escaped() . '</span></span>';
 		} else {
-			$link = $sk->commentBlock( $file->getRawDescription() );
-			if( $file->isDeleted(File::DELETED_COMMENT) )
+			$link = Linker::commentBlock( $file->getRawDescription() );
+			if( $file->isDeleted( File::DELETED_COMMENT ) ) {
 				$link = '<span class="history-deleted">' . $link . '</span>';
+			}
 			return $link;
 		}
 	}
 
 	function undelete() {
-		global $wgOut, $wgUser;
+		global $wgUploadMaintenance;
+
+		if ( $wgUploadMaintenance && $this->mTargetObj->getNamespace() == NS_FILE ) {
+			throw new ErrorPageError( 'undelete-error', 'filedelete-maintenance' );
+		}
+
 		if ( wfReadOnly() ) {
-			$wgOut->readOnlyPage();
-			return;
+			throw new ReadOnlyError;
 		}
-		if( !is_null( $this->mTargetObj ) ) {
-			$archive = new PageArchive( $this->mTargetObj );
-			$ok = $archive->undelete(
-				$this->mTargetTimestamp,
-				$this->mComment,
-				$this->mFileVersions,
-				$this->mUnsuppress );
-
-			if( is_array($ok) ) {
-				if ( $ok[1] ) // Undeleted file count
-					wfRunHooks( 'FileUndeleteComplete', array(
-						$this->mTargetObj, $this->mFileVersions,
-						$wgUser, $this->mComment) );
-
-				$skin = $wgUser->getSkin();
-				$link = $skin->linkKnown( $this->mTargetObj );
-				$wgOut->addHTML( wfMsgWikiHtml( 'undeletedpage', $link ) );
-			} else {
-				$wgOut->showFatalError( wfMsg( "cannotundelete" ) );
-				$wgOut->addHTML( '<p>' . wfMsgHtml( "undeleterevdel" ) . '</p>' );
-			}
 
-			// Show file deletion warnings and errors
-			$status = $archive->getFileStatus();
-			if( $status && !$status->isGood() ) {
-				$wgOut->addWikiText( $status->getWikiText( 'undelete-error-short', 'undelete-error-long' ) );
+		$out = $this->getOutput();
+		$archive = new PageArchive( $this->mTargetObj );
+		wfRunHooks( 'UndeleteForm::undelete', array( &$archive, $this->mTargetObj ) );
+		$ok = $archive->undelete(
+			$this->mTargetTimestamp,
+			$this->mComment,
+			$this->mFileVersions,
+			$this->mUnsuppress );
+
+		if( is_array( $ok ) ) {
+			if ( $ok[1] ) { // Undeleted file count
+				wfRunHooks( 'FileUndeleteComplete', array(
+					$this->mTargetObj, $this->mFileVersions,
+					$this->getUser(), $this->mComment ) );
 			}
+
+			$link = Linker::linkKnown( $this->mTargetObj );
+			$out->addHTML( $this->msg( 'undeletedpage' )->rawParams( $link )->parse() );
 		} else {
-			$wgOut->showFatalError( wfMsg( "cannotundelete" ) );
+			$out->setPageTitle( $this->msg( 'undelete-error' ) );
+			$out->addWikiMsg( 'cannotundelete' );
+			$out->addWikiMsg( 'undeleterevdel' );
+		}
+
+		// Show file deletion warnings and errors
+		$status = $archive->getFileStatus();
+		if( $status && !$status->isGood() ) {
+			$out->addWikiText( $status->getWikiText( 'undelete-error-short', 'undelete-error-long' ) );
 		}
-		return false;
 	}
 }