X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FSpecialUndelete.php;h=fb7c43bc5baebd6a830df5b8a4ce337a69bfda4c;hb=1e7e73444a9357be1c58301e8707c029f31f5ef7;hp=a156b97966fe2a8c08e9a76985593987babcb980;hpb=4f932824801f8f435703ad41c7ced7e2fc6e5d13;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php
index a156b97966..fb7c43bc5b 100644
--- a/includes/SpecialUndelete.php
+++ b/includes/SpecialUndelete.php
@@ -4,52 +4,93 @@
  * Special page allowing users with the appropriate permissions to view
  * and restore deleted content
  *
- * @package MediaWiki
- * @subpackage Special pages
+ * @addtogroup SpecialPage
  */
 
 /**
- *
+ * Constructor
  */
 function wfSpecialUndelete( $par ) {
-    global $wgRequest;
+	global $wgRequest;
 
 	$form = new UndeleteForm( $wgRequest, $par );
 	$form->execute();
 }
 
 /**
- *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * Used to show archived pages and eventually restore them.
+ * @addtogroup SpecialPage
  */
 class PageArchive {
-	var $title;
+	protected $title;
+	var $fileStatus;
 
-	function PageArchive( &$title ) {
+	function __construct( $title ) {
 		if( is_null( $title ) ) {
 			throw new MWException( 'Archiver() given a null title.');
 		}
-		$this->title =& $title;
+		$this->title = $title;
 	}
 
 	/**
 	 * List all deleted pages recorded in the archive table. Returns result
 	 * wrapper with (ar_namespace, ar_title, count) fields, ordered by page
-	 * namespace/title. Can be called staticaly.
+	 * namespace/title.
 	 *
 	 * @return ResultWrapper
 	 */
-	/* static */ function listAllPages() {
-		$dbr =& wfGetDB( DB_SLAVE );
-		$archive = $dbr->tableName( 'archive' );
-
-		$sql = "SELECT ar_namespace,ar_title, COUNT(*) AS count FROM $archive " .
-		  "GROUP BY ar_namespace,ar_title ORDER BY ar_namespace,ar_title";
-
-		return $dbr->resultObject( $dbr->query( $sql, 'PageArchive::listAllPages' ) );
+	public static function listAllPages() {
+		$dbr = wfGetDB( DB_SLAVE );
+		return self::listPages( $dbr, '' );
+	}
+	
+	/**
+	 * List deleted pages recorded in the archive table matching the
+	 * given title prefix.
+	 * Returns result wrapper with (ar_namespace, ar_title, count) fields.
+	 *
+	 * @return ResultWrapper
+	 */
+	public static function listPagesByPrefix( $prefix ) {
+		$dbr = wfGetDB( DB_SLAVE );
+		
+		$title = Title::newFromText( $prefix );
+		if( $title ) {
+			$ns = $title->getNamespace();
+			$encPrefix = $dbr->escapeLike( $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%'",
+		);
+		return self::listPages( $dbr, $conds );
 	}
 
+	protected static function listPages( $dbr, $condition ) {
+		return $dbr->resultObject(
+			$dbr->select(
+				array( 'archive' ),
+				array(
+					'ar_namespace',
+					'ar_title',
+					'COUNT(*) AS count'
+				),
+				$condition,
+				__METHOD__,
+				array(
+					'GROUP BY' => 'ar_namespace,ar_title',
+					'ORDER BY' => 'ar_namespace,ar_title',
+					'LIMIT' => 100,
+				)
+			)
+		);
+	}
+	
 	/**
 	 * List the revisions of the given page. Returns result wrapper with
 	 * (ar_minor_edit, ar_timestamp, ar_user, ar_user_text, ar_comment) fields.
@@ -57,9 +98,9 @@ class PageArchive {
 	 * @return ResultWrapper
 	 */
 	function listRevisions() {
-		$dbr =& wfGetDB( DB_SLAVE );
+		$dbr = wfGetDB( DB_SLAVE );
 		$res = $dbr->select( 'archive',
-			array( 'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text', 'ar_comment' ),
+			array( 'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text', 'ar_comment', 'ar_len', 'ar_deleted' ),
 			array( 'ar_namespace' => $this->title->getNamespace(),
 			       'ar_title' => $this->title->getDBkey() ),
 			'PageArchive::listRevisions',
@@ -74,24 +115,32 @@ class PageArchive {
 	 * if not a file page.
 	 *
 	 * @return ResultWrapper
-	 * @fixme Does this belong in Image for fuller encapsulation?
+	 * @todo Does this belong in Image for fuller encapsulation?
 	 */
 	function listFiles() {
 		if( $this->title->getNamespace() == NS_IMAGE ) {
-			$dbr =& wfGetDB( DB_SLAVE );
+			$dbr = wfGetDB( DB_SLAVE );
 			$res = $dbr->select( 'filearchive',
 				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' ),
-				array( 'fa_name' => $this->title->getDbKey() ),
+					'fa_timestamp',
+					'fa_deleted' ),
+				array( 'fa_name' => $this->title->getDBkey() ),
 				__METHOD__,
 				array( 'ORDER BY' => 'fa_timestamp DESC' ) );
 			$ret = $dbr->resultObject( $res );
@@ -119,7 +168,7 @@ class PageArchive {
 	 * @return Revision
 	 */
 	function getRevision( $timestamp ) {
-		$dbr =& wfGetDB( DB_SLAVE );
+		$dbr = wfGetDB( DB_SLAVE );
 		$row = $dbr->selectRow( 'archive',
 			array(
 				'ar_rev_id',
@@ -130,9 +179,11 @@ class PageArchive {
 				'ar_timestamp',
 				'ar_minor_edit',
 				'ar_flags',
-				'ar_text_id' ),
+				'ar_text_id',
+				'ar_deleted',
+				'ar_len' ),
 			array( 'ar_namespace' => $this->title->getNamespace(),
-			       'ar_title' => $this->title->getDbkey(),
+			       'ar_title' => $this->title->getDBkey(),
 			       'ar_timestamp' => $dbr->timestamp( $timestamp ) ),
 			__METHOD__ );
 		if( $row ) {
@@ -147,11 +198,66 @@ class PageArchive {
 				'user_text'  => $row->ar_user_text,
 				'timestamp'  => $row->ar_timestamp,
 				'minor_edit' => $row->ar_minor_edit,
-				'text_id'    => $row->ar_text_id ) );
+				'text_id'    => $row->ar_text_id,
+				'deleted'    => $row->ar_deleted,
+				'len'        => $row->ar_len) );
 		} 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;
+		}
+	}
 
 	/**
 	 * Get the text from an archive row containing ar_text, ar_flags and ar_text_id
@@ -163,7 +269,7 @@ class PageArchive {
 			return Revision::getRevisionText( $row, "ar_" );
 		} else {
 			// New-style: keyed to the text storage backend.
-			$dbr =& wfGetDB( DB_SLAVE );
+			$dbr = wfGetDB( DB_SLAVE );
 			$text = $dbr->selectRow( 'text',
 				array( 'old_text', 'old_flags' ),
 				array( 'old_id' => $row->ar_text_id ),
@@ -182,7 +288,7 @@ class PageArchive {
 	 * @return string
 	 */
 	function getLastRevisionText() {
-		$dbr =& wfGetDB( DB_SLAVE );
+		$dbr = wfGetDB( DB_SLAVE );
 		$row = $dbr->selectRow( 'archive',
 			array( 'ar_text', 'ar_flags', 'ar_text_id' ),
 			array( 'ar_namespace' => $this->title->getNamespace(),
@@ -201,7 +307,7 @@ class PageArchive {
 	 * @return bool
 	 */
 	function isDeleted() {
-		$dbr =& wfGetDB( DB_SLAVE );
+		$dbr = wfGetDB( DB_SLAVE );
 		$n = $dbr->selectField( 'archive', 'COUNT(ar_title)',
 			array( 'ar_namespace' => $this->title->getNamespace(),
 			       'ar_title' => $this->title->getDBkey() ) );
@@ -216,10 +322,12 @@ class PageArchive {
 	 * @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
 	 *
-	 * @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( $timestamps, $comment = '', $fileVersions = array() ) {
+	function undelete( $timestamps, $comment = '', $fileVersions = array(), $unsuppress = false ) {
 		// If both the set of text revisions and file revisions are empty,
 		// restore everything. Otherwise, just restore the requested items.
 		$restoreAll = empty( $timestamps ) && empty( $fileVersions );
@@ -228,31 +336,34 @@ class PageArchive {
 		$restoreFiles = $restoreAll || !empty( $fileVersions );
 		
 		if( $restoreFiles && $this->title->getNamespace() == NS_IMAGE ) {
-			$img = new Image( $this->title );
-			$filesRestored = $img->restore( $fileVersions );
+			$img = wfLocalFile( $this->title );
+			$this->fileStatus = $img->restore( $fileVersions, $unsuppress );
+			$filesRestored = $this->fileStatus->successCount;
 		} else {
 			$filesRestored = 0;
 		}
 		
 		if( $restoreText ) {
-			$textRestored = $this->undeleteRevisions( $timestamps );
+			$textRestored = $this->undeleteRevisions( $timestamps, $unsuppress );
+			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 = wfMsgForContent( 'undeletedrevisions-files',
+			$reason = wfMsgExt( 'undeletedrevisions-files', array( 'content', 'parsemag' ),
 				$wgContLang->formatNum( $textRestored ),
 				$wgContLang->formatNum( $filesRestored ) );
 		} elseif( $textRestored ) {
-			$reason = wfMsgForContent( 'undeletedrevisions',
+			$reason = wfMsgExt( 'undeletedrevisions', array( 'content', 'parsemag' ),
 				$wgContLang->formatNum( $textRestored ) );
 		} elseif( $filesRestored ) {
-			$reason = wfMsgForContent( 'undeletedfiles',
+			$reason = wfMsgExt( 'undeletedfiles', array( 'content', 'parsemag' ),
 				$wgContLang->formatNum( $filesRestored ) );
 		} else {
 			wfDebug( "Undelete: nothing undeleted...\n" );
@@ -262,8 +373,8 @@ class PageArchive {
 		if( trim( $comment ) != '' )
 			$reason .= ": {$comment}";
 		$log->addEntry( 'restore', $this->title, $reason );
-		
-		return true;
+
+		return array($textRestored, $filesRestored, $reason);
 	}
 	
 	/**
@@ -274,22 +385,20 @@ class PageArchive {
 	 * @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( $timestamps ) {
-		global $wgDBtype;
-
+	private function undeleteRevisions( $timestamps, $unsuppress = false ) {
+		if ( wfReadOnly() )
+			return false;
 		$restoreAll = empty( $timestamps );
 		
-		$dbw =& wfGetDB( DB_MASTER );
-		$page = $dbw->tableName( 'archive' );
+		$dbw = wfGetDB( DB_MASTER );
 
 		# Does this page already exist? We'll have to update it...
 		$article = new Article( $this->title );
-		$options = ( $wgDBtype == 'postgres' )
-			? '' // pg doesn't support this?
-			: 'FOR UPDATE';
+		$options = 'FOR UPDATE';
 		$page = $dbw->selectRow( 'page',
 			array( 'page_id', 'page_latest' ),
 			array( 'page_namespace' => $this->title->getNamespace(),
@@ -297,16 +406,25 @@ class PageArchive {
 			__METHOD__,
 			$options );
 		if( $page ) {
+			$makepage = false;
 			# 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 0;
+			}
 		} else {
 			# Have to create a new article...
-			$newid  = $article->insertOn( $dbw );
-			$pageId = $newid;
+			$makepage = true;
 			$previousRevId = 0;
+			$previousTimestamp = 0;
 		}
 
 		if( $restoreAll ) {
@@ -321,7 +439,7 @@ class PageArchive {
 		}
 
 		/**
-		 * Restore each revision...
+		 * Select each archived revision...
 		 */
 		$result = $dbw->select( 'archive',
 			/* fields */ array(
@@ -333,7 +451,10 @@ class PageArchive {
 				'ar_timestamp',
 				'ar_minor_edit',
 				'ar_flags',
-				'ar_text_id' ),
+				'ar_text_id',
+				'ar_deleted',
+				'ar_page_id',
+				'ar_len' ),
 			/* WHERE */ array(
 				'ar_namespace' => $this->title->getNamespace(),
 				'ar_title'     => $this->title->getDBkey(),
@@ -342,15 +463,32 @@ class PageArchive {
 			/* options */ array(
 				'ORDER BY' => 'ar_timestamp' )
 			);
-		if( $dbw->numRows( $result ) < count( $timestamps ) ) {
-			wfDebug( __METHOD__.": couldn't find all requested rows\n" );
-			return false;
+		$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( $makepage ) {
+			$newid  = $article->insertOn( $dbw );
+			$pageId = $newid;
+		}
+
 		$revision = null;
 		$restored = 0;
-
-		while( $row = $dbw->fetchObject( $result ) ) {
+		
+		while( $row = $ret->fetchObject() ) {
 			if( $row->ar_text_id ) {
 				// Revision was deleted in 1.5+; text is in
 				// the regular text table, use the reference.
@@ -373,28 +511,42 @@ 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
 				) );
 			$revision->insertOn( $dbw );
 			$restored++;
+			
+			wfRunHooks( 'ArticleRevisionUndeleted', array( &$this->title, $revision, $row->ar_page_id ) );
 		}
+		// Was anything restored at all?
+		if($restored == 0)
+			return 0;
 
 		if( $revision ) {
-			# FIXME: Update latest if newer as well...
-			if( $newid ) {
-				// Attach the latest revision to the page...
-				$article->updateRevisionOn( $dbw, $revision, $previousRevId );
-				
+			// Attach the latest revision to the page...
+			$wasnew = $article->updateIfNewerOn( $dbw, $revision, $previousRevId );
+
+			if( $newid || $wasnew ) {
 				// Update site stats, link tables, etc
 				$article->createUpdates( $revision );
 			}
 
 			if( $newid ) {
+				wfRunHooks( 'ArticleUndelete', array( &$this->title, true ) );
 				Article::onArticleCreate( $this->title );
 			} else {
+				wfRunHooks( 'ArticleUndelete', array( &$this->title, false ) );
 				Article::onArticleEdit( $this->title );
 			}
+
+			if( $this->title->getNamespace() == NS_IMAGE ) {
+				$update = new HTMLCacheUpdate( $this->title, 'imagelinks' );
+				$update->doUpdate();
+			}
 		} else {
-			# Something went terribly wrong!
+			// 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
@@ -408,21 +560,23 @@ class PageArchive {
 		return $restored;
 	}
 
+	function getFileStatus() { return $this->fileStatus; }
 }
 
 /**
- *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * The HTML form for Special:Undelete, which allows users with the appropriate
+ * permissions to view and restore deleted content.
+ * @addtogroup SpecialPage
  */
 class UndeleteForm {
 	var $mAction, $mTarget, $mTimestamp, $mRestore, $mTargetObj;
 	var $mTargetTimestamp, $mAllowed, $mComment;
 
-	function UndeleteForm( &$request, $par = "" ) {
+	function UndeleteForm( $request, $par = "" ) {
 		global $wgUser;
 		$this->mAction = $request->getVal( 'action' );
 		$this->mTarget = $request->getVal( 'target' );
+		$this->mSearchPrefix = $request->getText( 'prefix' );
 		$time = $request->getVal( 'timestamp' );
 		$this->mTimestamp = $time ? wfTimestamp( TS_MW, $time ) : '';
 		$this->mFile = $request->getVal( 'file' );
@@ -431,12 +585,14 @@ class UndeleteForm {
 			$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;
 		}
-		if ( $wgUser->isAllowed( 'delete' ) && !$wgUser->isBlocked() ) {
+		if ( $wgUser->isAllowed( 'undelete' ) && !$wgUser->isBlocked() ) {
 			$this->mAllowed = true;
 		} else {
 			$this->mAllowed = false;
@@ -467,15 +623,40 @@ class UndeleteForm {
 	}
 
 	function execute() {
-
+		global $wgOut, $wgUser;
+		if ( $this->mAllowed ) {
+			$wgOut->setPagetitle( wfMsg( "undeletepage" ) );
+		} else {
+			$wgOut->setPagetitle( wfMsg( "viewdeletedpage" ) );
+		}
+		
 		if( is_null( $this->mTargetObj ) ) {
-			return $this->showList();
+		# Not all users can just browse every deleted page from the list
+			if( $wgUser->isAllowed( 'browsearchive' ) ) {
+				$this->showSearchForm();
+
+				# List undeletable articles
+				if( $this->mSearchPrefix ) {
+					$result = PageArchive::listPagesByPrefix( $this->mSearchPrefix );
+					$this->showList( $result );
+				}
+			} else {
+				$wgOut->addWikiText( wfMsgHtml( 'undelete-header' ) );
+			}
+			return;
 		}
 		if( $this->mTimestamp !== '' ) {
 			return $this->showRevision( $this->mTimestamp );
 		}
 		if( $this->mFile !== null ) {
-			return $this->showFile( $this->mFile );
+			$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 );
+			}
 		}
 		if( $this->mRestore && $this->mAction == "submit" ) {
 			return $this->undelete();
@@ -483,26 +664,49 @@ class UndeleteForm {
 		return $this->showHistory();
 	}
 
-	/* private */ function showList() {
-		global $wgLang, $wgContLang, $wgUser, $wgOut;
-
-		# List undeletable articles
-		$result = PageArchive::listAllPages();
+	function showSearchForm() {
+		global $wgOut, $wgScript;
+		$wgOut->addWikiMsg( 'undelete-header' );
+		
+		$wgOut->addHtml(
+			Xml::openElement( 'form', array(
+				'method' => 'get',
+				'action' => $wgScript ) ) .
+			'<fieldset>' .
+			Xml::element( 'legend', array(),
+				wfMsg( 'undelete-search-box' ) ) .
+			Xml::hidden( 'title',
+				SpecialPage::getTitleFor( 'Undelete' )->getPrefixedDbKey() ) .
+			Xml::inputLabel( wfMsg( 'undelete-search-prefix' ),
+				'prefix', 'prefix', 20,
+				$this->mSearchPrefix ) .
+			Xml::submitButton( wfMsg( 'undelete-search-submit' ) ) .
+			'</fieldset>' .
+			'</form>' );
+	}
 
-		if ( $this->mAllowed ) {
-			$wgOut->setPagetitle( wfMsg( "undeletepage" ) );
-		} else {
-			$wgOut->setPagetitle( wfMsg( "viewdeletedpage" ) );
+	// Generic list of deleted pages
+	private function showList( $result ) {
+		global $wgLang, $wgContLang, $wgUser, $wgOut;
+		
+		if( $result->numRows() == 0 ) {
+			$wgOut->addWikiMsg( 'undelete-no-results' );
+			return;
 		}
-		$wgOut->addWikiText( wfMsg( "undeletepagetext" ) );
+
+		$wgOut->addWikiMsg( "undeletepagetext" );
 
 		$sk = $wgUser->getSkin();
 		$undelete = SpecialPage::getTitleFor( 'Undelete' );
 		$wgOut->addHTML( "<ul>\n" );
 		while( $row = $result->fetchObject() ) {
 			$title = Title::makeTitleSafe( $row->ar_namespace, $row->ar_title );
-			$link = $sk->makeKnownLinkObj( $undelete, htmlspecialchars( $title->getPrefixedText() ), 'target=' . $title->getPrefixedUrl() );
-			$revs = wfMsgHtml( 'undeleterevisions', $wgLang->formatNum( $row->count ) );
+			$link = $sk->makeKnownLinkObj( $undelete, htmlspecialchars( $title->getPrefixedText() ), 
+				'target=' . $title->getPrefixedUrl() );
+			#$revs = wfMsgHtml( 'undeleterevisions', $wgLang->formatNum( $row->count ) );
+			$revs = wfMsgExt( 'undeleterevisions',
+				array( 'parseinline' ),
+				$wgLang->formatNum( $row->count ) );
 			$wgOut->addHtml( "<li>{$link} ({$revs})</li>\n" );
 		}
 		$result->free();
@@ -511,7 +715,7 @@ class UndeleteForm {
 		return true;
 	}
 
-	/* private */ function showRevision( $timestamp ) {
+	private function showRevision( $timestamp ) {
 		global $wgLang, $wgUser, $wgOut;
 		$self = SpecialPage::getTitleFor( 'Undelete' );
 		$skin = $wgUser->getSkin();
@@ -521,30 +725,60 @@ class UndeleteForm {
 		$archive = new PageArchive( $this->mTargetObj );
 		$rev = $archive->getRevision( $timestamp );
 		
-		$wgOut->setPageTitle( wfMsg( 'undeletepage' ) );
-		$link = $skin->makeKnownLinkObj( $self, htmlspecialchars( $this->mTargetObj->getPrefixedText() ),
-					'target=' . $this->mTargetObj->getPrefixedUrl() );
-		$wgOut->addHtml( '<p>' . wfMsgHtml( 'undelete-revision', $link,
-			htmlspecialchars( $wgLang->timeAndDate( $timestamp ) ) ) . '</p>' ); 
-		
 		if( !$rev ) {
-			$wgOut->addWikiText( wfMsg( 'undeleterevision-missing' ) );
+			$wgOut->addWikiMsg( '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(
+			SpecialPage::getTitleFor( 'Undelete', $this->mTargetObj->getPrefixedDBkey() ),
+			htmlspecialchars( $this->mTargetObj->getPrefixedText() )
+		);
+		$time = htmlspecialchars( $wgLang->timeAndDate( $timestamp, true ) );
+		$user = $skin->revUserTools( $rev );
+
+		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->addWikiTextTitle( $rev->getText(), $archive->title, false );
+			$wgOut->addWikiTextTitleTidy( $rev->revText(), $this->mTargetObj, false );
 		}
 
 		$wgOut->addHtml(
 			wfElement( 'textarea', array(
-					'readonly' => true,
+					'readonly' => 'readonly',
 					'cols' => intval( $wgUser->getOption( 'cols' ) ),
 					'rows' => intval( $wgUser->getOption( 'rows' ) ) ),
-				$rev->getText() . "\n" ) .
+				$rev->revText() . "\n" ) .
 			wfOpenElement( 'div' ) .
 			wfOpenElement( 'form', array(
 				'method' => 'post',
@@ -562,20 +796,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' ) );
 	}
 	
+	/**
+	 * 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;
+		
+		$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" );
+
+	}
+	
+	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();
+		}
+		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.
 	 */
-	function showFile( $key ) {
+	private function showFile( $key ) {
 		global $wgOut, $wgRequest;
 		$wgOut->disable();
 		
@@ -591,37 +892,40 @@ class UndeleteForm {
 		$store->stream( $key );
 	}
 
-	/* private */ function showHistory() {
-		global $wgLang, $wgUser, $wgOut;
+	private function showHistory() {
+		global $wgLang, $wgContLang, $wgUser, $wgOut;
 
 		$sk = $wgUser->getSkin();
-		if ( $this->mAllowed ) {
+		if( $this->mAllowed ) {
 			$wgOut->setPagetitle( wfMsg( "undeletepage" ) );
 		} else {
 			$wgOut->setPagetitle( wfMsg( 'viewdeletedpage' ) );
 		}
+		
+		$wgOut->addWikiText( wfMsgHtml( 'undeletepagetitle', $this->mTargetObj->getPrefixedText()) );
 
 		$archive = new PageArchive( $this->mTargetObj );
 		/*
 		$text = $archive->getLastRevisionText();
 		if( is_null( $text ) ) {
-			$wgOut->addWikiText( wfMsg( "nohistory" ) );
+			$wgOut->addWikiMsg( "nohistory" );
 			return;
 		}
 		*/
 		if ( $this->mAllowed ) {
-			$wgOut->addWikiText( wfMsg( "undeletehistory" ) );
+			$wgOut->addWikiMsg( "undeletehistory" );
+			$wgOut->addWikiMsg( "undeleterevdel" );
 		} else {
-			$wgOut->addWikiText( wfMsg( "undeletehistorynoadmin" ) );
+			$wgOut->addWikiMsg( "undeletehistorynoadmin" );
 		}
 
 		# List all stored revisions
 		$revisions = $archive->listRevisions();
 		$files = $archive->listFiles();
-		
+
 		$haveRevisions = $revisions && $revisions->numRows() > 0;
 		$haveFiles = $files && $files->numRows() > 0;
-		
+
 		# Batch existence check on user and talk pages
 		if( $haveRevisions ) {
 			$batch = new LinkBatch();
@@ -646,123 +950,328 @@ class UndeleteForm {
 			$titleObj = SpecialPage::getTitleFor( "Undelete" );
 			$action = $titleObj->getLocalURL( "action=submit" );
 			# Start the form here
-			$top = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'undelete' ) );
+			$top = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'undelete' ) );
 			$wgOut->addHtml( $top );
 		}
 
 		# Show relevant lines from the deletion log:
-		$wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" );
+		$wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) . "\n" );
 		$logViewer = new LogViewer(
 			new LogReader(
 				new FauxRequest(
-					array( 'page' => $this->mTargetObj->getPrefixedText(),
-						   'type' => 'delete' ) ) ) );
+					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
-			$table = '<fieldset><table><tr>';
-			$table .= '<td colspan="2">' . wfMsgWikiHtml( 'undeleteextrahelp' ) . '</td></tr><tr>';
-			$table .= '<td align="right"><strong>' . wfMsgHtml( 'undeletecomment' ) . '</strong></td>';
-			$table .= '<td>' . wfInput( 'wpComment', 50, $this->mComment ) . '</td>';
-			$table .= '</tr><tr><td>&nbsp;</td><td>';
-			$table .= wfSubmitButton( wfMsg( 'undeletebtn' ), array( 'name' => 'restore' ) );
-			$table .= wfElement( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'undeletereset' ) ) );
-			$table .= '</td></tr></table></fieldset>';
+			$align = $wgContLang->isRtl() ? 'left' : 'right';
+			$table =
+				Xml::openElement( 'fieldset' ) .
+				Xml::element( 'legend', null, wfMsg( 'undelete') ).
+				Xml::openElement( 'table', array( 'id' => 'mw-undelete-table' ) ) .
+					"<tr>
+						<td colspan='2'>" .
+							wfMsgWikiHtml( 'undeleteextrahelp' ) .
+						"</td>
+					</tr>
+					<tr>
+						<td align='$align'>" .
+							Xml::label( wfMsg( 'undeletecomment' ), 'wpComment' ) .
+						"</td>
+						<td>" .
+							Xml::input( 'wpComment', 50, $this->mComment ) .
+						"</td>
+					</tr>
+					<tr>
+						<td>&nbsp;</td>
+						<td>" .
+							Xml::submitButton( wfMsg( 'undeletebtn' ), array( 'name' => 'restore', 'id' => 'mw-undelete-submit' ) ) .
+							Xml::element( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'undeletereset' ), 'id' => 'mw-undelete-reset' ) ) .
+						"</td>
+					</tr>
+					<tr>
+						<td>&nbsp;</td>
+						<td>" .
+							Xml::check( 'wpUnsuppress', $this->mUnsuppress, array('id' => 'mw-undelete-unsupress') ) . ' ' .
+							Xml::label( wfMsgHtml('revdelete-unsuppress'), 'mw-undelete-unsupress' ) .
+						"</td>
+					</tr>" .
+				Xml::closeElement( 'table' ) .
+				Xml::closeElement( 'fieldset' );
+
 			$wgOut->addHtml( $table );
 		}
-	
-		$wgOut->addHTML( "<h2>" . htmlspecialchars( wfMsg( "history" ) ) . "</h2>\n" );
-		
+
+		$wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'history' ) ) . "\n" );
+
 		if( $haveRevisions ) {
 			# 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() ) {
-				$ts = wfTimestamp( TS_MW, $row->ar_timestamp );
-				if ( $this->mAllowed ) {
-					$checkBox = wfCheck( "ts$ts" );
-					$pageLink = $sk->makeKnownLinkObj( $titleObj,
-						$wgLang->timeanddate( $ts, true ),
-						"target=$target&timestamp=$ts" );
-				} else {
-					$checkBox = '';
-					$pageLink = $wgLang->timeanddate( $ts, true );
-				}
-				$userLink = $sk->userLink( $row->ar_user, $row->ar_user_text ) . $sk->userToolLinks( $row->ar_user, $row->ar_user_text );
-				$comment = $sk->commentBlock( $row->ar_comment );
-				$wgOut->addHTML( "<li>$checkBox $pageLink . . $userLink $comment</li>\n" );
-	
+				$remaining--;
+				$wgOut->addHTML( $this->formatRevisionRow( $row, $earliestLiveTime, $remaining, $sk ) );
 			}
 			$revisions->free();
 			$wgOut->addHTML("</ul>");
 		} else {
-			$wgOut->addWikiText( wfMsg( "nohistory" ) );
+			$wgOut->addWikiMsg( "nohistory" );
 		}
 
-		
 		if( $haveFiles ) {
-			$wgOut->addHtml( "<h2>" . wfMsgHtml( 'imghistory' ) . "</h2>\n" );
+			$wgOut->addHtml( Xml::element( 'h2', null, wfMsg( 'filehist' ) ) . "\n" );
 			$wgOut->addHtml( "<ul>" );
 			while( $row = $files->fetchObject() ) {
-				$ts = wfTimestamp( TS_MW, $row->fa_timestamp );
-				if ( $this->mAllowed && $row->fa_storage_key ) {
-					$checkBox = wfCheck( "fileid" . $row->fa_id );
-					$key = urlencode( $row->fa_storage_key );
-					$target = urlencode( $this->mTarget );
-					$pageLink = $sk->makeKnownLinkObj( $titleObj,
-						$wgLang->timeanddate( $ts, true ),
-						"target=$target&file=$key" );
-				} else {
-					$checkBox = '';
-					$pageLink = $wgLang->timeanddate( $ts, true );
-				}
- 				$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 ),
-						$wgLang->formatNum( $row->fa_height ) ) .
-					' (' .
-					wfMsgHtml( 'nbytes', $wgLang->formatNum( $row->fa_size ) ) .
-					')';
-				$comment = $sk->commentBlock( $row->fa_description );
-				$wgOut->addHTML( "<li>$checkBox $pageLink . . $userLink $data $comment</li>\n" );
+				$wgOut->addHTML( $this->formatFileRow( $row, $sk ) );
 			}
 			$files->free();
 			$wgOut->addHTML( "</ul>" );
 		}
-		
+
 		if ( $this->mAllowed ) {
 			# Slip in the hidden controls here
-			$misc  = wfHidden( 'target', $this->mTarget );
-			$misc .= wfHidden( 'wpEditToken', $wgUser->editToken() );
-			$wgOut->addHtml( $misc . '</form>' );
+			$misc  = Xml::hidden( 'target', $this->mTarget );
+			$misc .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
+			$misc .= Xml::closeElement( 'form' );
+			$wgOut->addHtml( $misc );
 		}
 
 		return true;
 	}
 
+	private function formatRevisionRow( $row, $earliestLiveTime, $remaining, $sk ) {
+		global $wgUser, $wgLang;
+		
+		$rev = new Revision( array(
+				'page'       => $this->mTargetObj->getArticleId(),
+				'comment'    => $row->ar_comment,
+				'user'       => $row->ar_user,
+				'user_text'  => $row->ar_user_text,
+				'timestamp'  => $row->ar_timestamp,
+				'minor_edit' => $row->ar_minor_edit,
+				'deleted'    => $row->ar_deleted,
+				'len'        => $row->ar_len ) );
+		
+		$stxt = '';
+		$ts = wfTimestamp( TS_MW, $row->ar_timestamp );
+		if( $this->mAllowed ) {
+			$checkBox = Xml::check( "ts$ts" );
+			$titleObj = SpecialPage::getTitleFor( "Undelete" );
+			$pageLink = $this->getPageLink( $rev, $titleObj, $ts, $sk );
+			# Last link
+			if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
+				$last = wfMsgHtml('diff');
+			} else if( $remaining > 0 || ($earliestLiveTime && $ts > $earliestLiveTime) ) {
+				$last = $sk->makeKnownLinkObj( $titleObj, wfMsgHtml('diff'), 
+					"target=" . $this->mTargetObj->getPrefixedUrl() . "&timestamp=$ts&diff=prev" );
+			} else {
+				$last = wfMsgHtml('diff');
+			}
+		} else {
+			$checkBox = '';
+			$pageLink = $wgLang->timeanddate( $ts, true );
+			$last = wfMsgHtml('diff');
+		}
+		$userLink = $sk->revUserTools( $rev );
+		
+		if(!is_null($size = $row->ar_len)) {
+			if($size == 0)
+				$stxt = wfMsgHtml('historyempty');
+			else
+				$stxt = wfMsgHtml('historysize', $wgLang->formatNum( $size ) );
+		}
+		$comment = $sk->revComment( $rev );
+		$revdlink = '';
+		if( $wgUser->isAllowed( 'deleterevision' ) ) {
+			$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
+			if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
+			// If revision was hidden from sysops
+				$del = wfMsgHtml('rev-delundel');			
+			} else {
+				$ts = wfTimestamp( TS_MW, $row->ar_timestamp );
+				$del = $sk->makeKnownLinkObj( $revdel,
+					wfMsgHtml('rev-delundel'),
+					'target=' . $this->mTargetObj->getPrefixedUrl() . "&artimestamp=$ts" );
+				// Bolden oversighted content
+				if( $rev->isDeleted( Revision::DELETED_RESTRICTED ) )
+					$del = "<strong>$del</strong>";
+			}
+			$revdlink = "<tt>(<small>$del</small>)</tt>";
+		}
+		
+		return "<li>$checkBox $revdlink ($last) $pageLink . . $userLink $stxt $comment</li>";
+	}
+	
+	private function formatFileRow( $row, $sk ) {
+		global $wgUser, $wgLang;
+	
+		$file = ArchivedFile::newFromRow( $row );
+		
+		$ts = wfTimestamp( TS_MW, $row->fa_timestamp );
+		if( $this->mAllowed && $row->fa_storage_key ) {
+			$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 );
+		} else {
+			$checkBox = '';
+			$pageLink = $wgLang->timeanddate( $ts, true );
+		}
+ 		$userLink = $this->getFileUser( $file, $sk );
+		$data =
+			wfMsgHtml( 'widthheight',
+				$wgLang->formatNum( $row->fa_width ),
+				$wgLang->formatNum( $row->fa_height ) ) .
+			' (' .
+			wfMsgHtml( 'nbytes', $wgLang->formatNum( $row->fa_size ) ) .
+			')';
+		$comment = $this->getFileComment( $file, $sk );
+		$revdlink = '';
+		if( $wgUser->isAllowed( 'deleterevision' ) ) {
+			$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
+			if( !$file->userCan(File::DELETED_RESTRICTED ) ) {
+			// If revision was hidden from sysops
+				$del = $this->messages['rev-delundel'];
+			} else {
+				$del = $sk->makeKnownLinkObj( $revdel,
+					wfMsgHtml('rev-delundel'),
+					'target=' . $this->mTargetObj->getPrefixedUrl() .
+					'&fileid=' . $row->fa_id );
+				// Bolden oversighted content
+				if( $file->isDeleted( File::DELETED_RESTRICTED ) )
+					$del = "<strong>$del</strong>";
+			}
+			$revdlink = "<tt>(<small>$del</small>)</tt>";
+		}
+		return "<li>$checkBox $revdlink $pageLink . . $userLink $data $comment</li>\n";
+	}
+	
+	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;
+	}
+
+	/**
+	 * Fetch revision text link if it's available to all users
+	 * @return string
+	 */
+	function getPageLink( $rev, $titleObj, $ts, $sk ) {
+		global $wgLang;
+		
+		if( !$rev->userCan(Revision::DELETED_TEXT) ) {
+			return '<span class="history-deleted">' . $wgLang->timeanddate( $ts, true ) . '</span>';
+		} else {
+			$link = $sk->makeKnownLinkObj( $titleObj, $wgLang->timeanddate( $ts, true ), 
+				"target=".$this->mTargetObj->getPrefixedUrl()."&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, $key, $sk ) {
+		global $wgLang;
+
+		if( !$file->userCan(File::DELETED_FILE) ) {
+			return '<span class="history-deleted">' . $wgLang->timeanddate( $ts, true ) . '</span>';
+		} else {
+			$link = $sk->makeKnownLinkObj( $titleObj, $wgLang->timeanddate( $ts, true ), 
+				"target=".$this->mTargetObj->getPrefixedUrl()."&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, $sk ) {	
+		if( !$file->userCan(File::DELETED_USER) ) {
+			return '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
+		} else {
+			$link = $sk->userLink( $file->getRawUser(), $file->getRawUserText() ) . 
+				$sk->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
+	 */
+	function getFileComment( $file, $sk ) {
+		if( !$file->userCan(File::DELETED_COMMENT) ) {
+			return '<span class="history-deleted"><span class="comment">' . wfMsgHtml( 'rev-deleted-comment' ) . '</span></span>';
+		} else {
+			$link = $sk->commentBlock( $file->getRawDescription() );
+			if( $file->isDeleted(File::DELETED_COMMENT) )
+				$link = '<span class="history-deleted">' . $link . '</span>';
+			return $link;
+		}
+	}
+
 	function undelete() {
 		global $wgOut, $wgUser;
+		if ( wfReadOnly() ) {
+			$wgOut->readOnlyPage();
+			return;
+		}
 		if( !is_null( $this->mTargetObj ) ) {
 			$archive = new PageArchive( $this->mTargetObj );
-			
 			$ok = $archive->undelete(
 				$this->mTargetTimestamp,
 				$this->mComment,
-				$this->mFileVersions );
+				$this->mFileVersions,
+				$this->mUnsuppress );
+
+			if( is_array($ok) ) {
+				if ( $ok[1] ) // Undeleted file count
+					wfRunHooks( 'FileUndeleteComplete', array(
+						$this->mTargetObj, $this->mFileVersions, 
+						$wgUser, $this->mComment) );
 			
-			if( $ok ) {
-				$skin =& $wgUser->getSkin();
+				$skin = $wgUser->getSkin();
 				$link = $skin->makeKnownLinkObj( $this->mTargetObj );
 				$wgOut->addHtml( wfMsgWikiHtml( 'undeletedpage', $link ) );
-				return true;
+			} 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' ) );
+			}
+		} else {
+			$wgOut->showFatalError( wfMsg( "cannotundelete" ) );
 		}
-		$wgOut->showFatalError( wfMsg( "cannotundelete" ) );
 		return false;
 	}
 }
-
-?>