X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FImagePage.php;h=e836104035133004f5f3194c930314a5c4e874b4;hb=957850f0da357337c24291a29d5ea0f08b5050a9;hp=f95e536a9af79283bde93e4bc39dd82b3adac83a;hpb=c2f7ea4d7b71543b0851d378d3bfbd6ba89f95b3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index f95e536a9a..e836104035 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -1,52 +1,72 @@
 <?php
-
-if( !defined( 'MEDIAWIKI' ) )
-	die( 1 );
-
 /**
- * Special handling for image description pages
+ * Class for viewing MediaWiki file description pages
  *
  * @ingroup Media
  */
 class ImagePage extends Article {
 
-	/* private */ var $img;  // Image object
-	/* private */ var $displayImg;
-	/* private */ var $repo;
-	/* private */ var $fileLoaded;
+	/**
+	 * @var File
+	 */
+	private $displayImg;
+	/**
+	 * @var FileRepo
+	 */
+	private $repo;
+	private $fileLoaded;
+
 	var $mExtraDescription = false;
-	var $dupes;
 
-	function __construct( $title ) {
-		parent::__construct( $title );
-		$this->dupes = null;
-		$this->repo = null;
+	/**
+	 * @param $title Title
+	 * @return WikiFilePage
+	 */
+	protected function newPage( Title $title ) {
+		// Overload mPage with a file-specific page
+		return new WikiFilePage( $title );
 	}
-	
+
+	/**
+	 * Constructor from a page id
+	 * @param $id Int article ID to load
+	 */
+	public static function newFromID( $id ) {
+		$t = Title::newFromID( $id );
+		# @todo FIXME: Doesn't inherit right
+		return $t == null ? null : new self( $t );
+		# return $t == null ? null : new static( $t ); // PHP 5.3
+	}
+
+	/**
+	 * @param $file File:
+	 * @return void
+	 */
 	public function setFile( $file ) {
+		$this->mPage->setFile( $file );
 		$this->displayImg = $file;
-		$this->img = $file;
 		$this->fileLoaded = true;
 	}
 
 	protected function loadFile() {
-		if( $this->fileLoaded ) {
+		if ( $this->fileLoaded ) {
 			return true;
 		}
 		$this->fileLoaded = true;
 
-		$this->displayImg = $this->img = false;
-		wfRunHooks( 'ImagePageFindFile', array( $this, &$this->img, &$this->displayImg ) );
-		if( !$this->img ) {
-			$this->img = wfFindFile( $this->mTitle );
-			if( !$this->img ) {
-				$this->img = wfLocalFile( $this->mTitle );
+		$this->displayImg = $img = false;
+		wfRunHooks( 'ImagePageFindFile', array( $this, &$img, &$this->displayImg ) );
+		if ( !$img ) { // not set by hook?
+			$img = wfFindFile( $this->getTitle() );
+			if ( !$img ) {
+				$img = wfLocalFile( $this->getTitle() );
 			}
 		}
-		if( !$this->displayImg ) {
-			$this->displayImg = $this->img;
+		$this->mPage->setFile( $img );
+		if ( !$this->displayImg ) { // not set by hook?
+			$this->displayImg = $img;
 		}
-		$this->repo = $this->img->getRepo();
+		$this->repo = $img->getRepo();
 	}
 
 	/**
@@ -61,61 +81,73 @@ class ImagePage extends Article {
 
 	public function view() {
 		global $wgOut, $wgShowEXIF, $wgRequest, $wgUser;
+
+		$diff = $wgRequest->getVal( 'diff' );
+		$diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) );
+
+		if ( $this->getTitle()->getNamespace() != NS_FILE || ( isset( $diff ) && $diffOnly ) ) {
+			return parent::view();
+		}
+
 		$this->loadFile();
 
-		if( $this->mTitle->getNamespace() == NS_FILE && $this->img->getRedirected() ) {
-			if( $this->mTitle->getDBkey() == $this->img->getName() ) {
+		if ( $this->getTitle()->getNamespace() == NS_FILE && $this->mPage->getFile()->getRedirected() ) {
+			if ( $this->getTitle()->getDBkey() == $this->mPage->getFile()->getName() || isset( $diff ) ) {
 				// mTitle is the same as the redirect target so ask Article
 				// to perform the redirect for us.
-				return Article::view();
+				$wgRequest->setVal( 'diffonly', 'true' );
+				return parent::view();
 			} else {
-				// mTitle is not the same as the redirect target so it is 
+				// mTitle is not the same as the redirect target so it is
 				// probably the redirect page itself. Fake the redirect symbol
-				$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-				$wgOut->addHTML( $this->viewRedirect( Title::makeTitle( NS_FILE, $this->img->getName() ),
+				$wgOut->setPageTitle( $this->getTitle()->getPrefixedText() );
+				$wgOut->addHTML( $this->viewRedirect( Title::makeTitle( NS_FILE, $this->mPage->getFile()->getName() ),
 					/* $appendSubtitle */ true, /* $forceKnown */ true ) );
-				$this->viewUpdates();
+				$this->mPage->doViewUpdates( $this->getContext()->getUser() );
 				return;
 			}
 		}
 
-		$diff = $wgRequest->getVal( 'diff' );
-		$diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) );
-
-		if( $this->mTitle->getNamespace() != NS_FILE || ( isset( $diff ) && $diffOnly ) )
-			return Article::view();
-			
 		$this->showRedirectedFromHeader();
 
-		if( $wgShowEXIF && $this->displayImg->exists() ) {
-			// FIXME: bad interface, see note on MediaHandler::formatMetadata().
+		if ( $wgShowEXIF && $this->displayImg->exists() ) {
+			// @todo FIXME: Bad interface, see note on MediaHandler::formatMetadata().
 			$formattedMetadata = $this->displayImg->formatMetadata();
 			$showmeta = $formattedMetadata !== false;
 		} else {
 			$showmeta = false;
 		}
 
-		if( !$diff && $this->displayImg->exists() )
-			$wgOut->addHTML( $this->showTOC($showmeta) );
+		if ( !$diff && $this->displayImg->exists() ) {
+			$wgOut->addHTML( $this->showTOC( $showmeta ) );
+		}
 
-		if( !$diff )
+		if ( !$diff ) {
 			$this->openShowImage();
+		}
 
 		# No need to display noarticletext, we use our own message, output in openShowImage()
-		if( $this->getID() ) {
-			Article::view();
+		if ( $this->mPage->getID() ) {
+			# NS_FILE is in the user language, but this section (the actual wikitext)
+			# should be in page content language
+			$pageLang = $this->getTitle()->getPageLanguage();
+			$wgOut->addHTML( Xml::openElement( 'div', array( 'id' => 'mw-imagepage-content',
+				'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(),
+				'class' => 'mw-content-'.$pageLang->getDir() ) ) );
+			parent::view();
+			$wgOut->addHTML( Xml::closeElement( 'div' ) );
 		} else {
 			# Just need to set the right headers
 			$wgOut->setArticleFlag( true );
-			$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-			$this->viewUpdates();
+			$wgOut->setPageTitle( $this->getTitle()->getPrefixedText() );
+			$this->mPage->doViewUpdates( $this->getContext()->getUser() );
 		}
 
 		# Show shared description, if needed
-		if( $this->mExtraDescription ) {
-			$fol = wfMsgNoTrans( 'shareddescriptionfollows' );
-			if( $fol != '-' && !wfEmptyMsg( 'shareddescriptionfollows', $fol ) ) {
-				$wgOut->addWikiText( $fol );
+		if ( $this->mExtraDescription ) {
+			$fol = wfMessage( 'shareddescriptionfollows' );
+			if ( !$fol->isDisabled() ) {
+				$wgOut->addWikiText( $fol->plain() );
 			}
 			$wgOut->addHTML( '<div id="shared-image-desc">' . $this->mExtraDescription . "</div>\n" );
 		}
@@ -123,124 +155,75 @@ class ImagePage extends Article {
 		$this->closeShowImage();
 		$this->imageHistory();
 		// TODO: Cleanup the following
-		
+
 		$wgOut->addHTML( Xml::element( 'h2',
 			array( 'id' => 'filelinks' ),
 			wfMsg( 'imagelinks' ) ) . "\n" );
 		$this->imageDupes();
-		# TODO! FIXME! For some freaky reason, we can't redirect to foreign images.
+		# @todo FIXME: For some freaky reason, we can't redirect to foreign images.
 		# Yet we return metadata about the target. Definitely an issue in the FileRepo
-		$this->imageRedirects();
 		$this->imageLinks();
 
-		if( $showmeta ) {
-			global $wgStylePath, $wgStyleVersion;
-			$expand = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-expand' ) ) );
-			$collapse = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-collapse' ) ) );
+		# Allow extensions to add something after the image links
+		$html = '';
+		wfRunHooks( 'ImagePageAfterImageLinks', array( $this, &$html ) );
+		if ( $html ) {
+			$wgOut->addHTML( $html );
+		}
+
+		if ( $showmeta ) {
 			$wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ) . "\n" );
 			$wgOut->addWikiText( $this->makeMetadataTable( $formattedMetadata ) );
-			$wgOut->addScriptFile( 'metadata.js' );
-			$wgOut->addHTML(
-				"<script type=\"text/javascript\">attachMetadataToggle('mw_metadata', '$expand', '$collapse');</script>\n" );
-		}
-	}
-	
-	public function getRedirectTarget() {
-		$this->loadFile();
-		if( $this->img->isLocal() ) {
-			return parent::getRedirectTarget();
+			$wgOut->addModules( array( 'mediawiki.action.view.metadata' ) );
 		}
-		// Foreign image page
-		$from = $this->img->getRedirected();
-		$to = $this->img->getName();
-		if( $from == $to ) {
-			return null; 
-		}
-		return $this->mRedirectTarget = Title::makeTitle( NS_FILE, $to );
-	}
-	public function followRedirect() {
-		$this->loadFile();
-		if( $this->img->isLocal() ) {
-			return parent::followRedirect();
-		}
-		$from = $this->img->getRedirected();
-		$to = $this->img->getName();
-		if( $from == $to ) {
-			return false; 
+
+		// Add remote Filepage.css
+		if( !$this->repo->isLocal() ) {
+			$css = $this->repo->getDescriptionStylesheetUrl();
+			if ( $css ) {
+				$wgOut->addStyle( $css );
+			}
 		}
-		return Title::makeTitle( NS_FILE, $to );	
-	}
-	public function isRedirect( $text = false ) {
-		$this->loadFile();
-		if( $this->img->isLocal() )
-			return parent::isRedirect( $text );
-			
-		return (bool)$this->img->getRedirected();
+		// always show the local local Filepage.css, bug 29277
+		$wgOut->addModuleStyles( 'filepage' );
 	}
-	
-	public function isLocal() {
-		$this->loadFile();
-		return $this->img->isLocal();
-	}
-	
-	public function getFile() {
-		$this->loadFile();
-		return $this->img;
-	}
-	
+
+	/**
+	 * @return File
+	 */
 	public function getDisplayedFile() {
 		$this->loadFile();
 		return $this->displayImg;
 	}
-	
-	public function getDuplicates() {
-		$this->loadFile();
-		if( !is_null($this->dupes) ) {
-			return $this->dupes;
-		}
-		if( !( $hash = $this->img->getSha1() ) ) {
-			return $this->dupes = array();
-		}
-		$dupes = RepoGroup::singleton()->findBySha1( $hash );
-		// Remove duplicates with self and non matching file sizes
-		$self = $this->img->getRepoName().':'.$this->img->getName();
-		$size = $this->img->getSize();
-		foreach ( $dupes as $index => $file ) {
-			$key = $file->getRepoName().':'.$file->getName();
-			if( $key == $self )
-				unset( $dupes[$index] );
-			if( $file->getSize() != $size )
-				unset( $dupes[$index] );
-		}
-		return $this->dupes = $dupes;
-		
-	}
-	
 
 	/**
 	 * Create the TOC
 	 *
-	 * @param bool $metadata Whether or not to show the metadata link
-	 * @return string
+	 * @param $metadata Boolean: whether or not to show the metadata link
+	 * @return String
 	 */
 	protected function showTOC( $metadata ) {
-		global $wgLang;
-		$r = '<ul id="filetoc">
-			<li><a href="#file">' . wfMsgHtml( 'file-anchor-link' ) . '</a></li>
-			<li><a href="#filehistory">' . wfMsgHtml( 'filehist' ) . '</a></li>
-			<li><a href="#filelinks">' . wfMsgHtml( 'imagelinks' ) . "</a></li>\n" .
-			($metadata ? '			<li><a href="#metadata">' . wfMsgHtml( 'metadata' ) . '</a></li>' : '') . "
-			</ul>\n";
-		return $r;
+		$r = array(
+			'<li><a href="#file">' . wfMsgHtml( 'file-anchor-link' ) . '</a></li>',
+			'<li><a href="#filehistory">' . wfMsgHtml( 'filehist' ) . '</a></li>',
+			'<li><a href="#filelinks">' . wfMsgHtml( 'imagelinks' ) . '</a></li>',
+		);
+		if ( $metadata ) {
+			$r[] = '<li><a href="#metadata">' . wfMsgHtml( 'metadata' ) . '</a></li>';
+		}
+
+		wfRunHooks( 'ImagePageShowTOC', array( $this, &$r ) );
+
+		return '<ul id="filetoc">' . implode( "\n", $r ) . '</ul>';
 	}
 
 	/**
 	 * Make a table with metadata to be shown in the output page.
 	 *
-	 * FIXME: bad interface, see note on MediaHandler::formatMetadata().
+	 * @todo FIXME: Bad interface, see note on MediaHandler::formatMetadata().
 	 *
-	 * @param array $exif The array containing the EXIF data
-	 * @return string
+	 * @param $metadata Array: the array containing the EXIF data
+	 * @return String The metadata table. This is treated as Wikitext (!)
 	 */
 	protected function makeMetadataTable( $metadata ) {
 		$r = "<div class=\"mw-imagepage-section-metadata\">";
@@ -248,9 +231,9 @@ class ImagePage extends Article {
 		$r .= "<table id=\"mw_metadata\" class=\"mw_metadata\">\n";
 		foreach ( $metadata as $type => $stuff ) {
 			foreach ( $stuff as $v ) {
-				# FIXME, why is this using escapeId for a class?!
+				# @todo FIXME: Why is this using escapeId for a class?!
 				$class = Sanitizer::escapeId( $v['id'] );
-				if( $type == 'collapsed' ) {
+				if ( $type == 'collapsed' ) {
 					$class .= ' collapsable';
 				}
 				$r .= "<tr class=\"$class\">\n";
@@ -267,30 +250,29 @@ class ImagePage extends Article {
 	 *
 	 * Omit noarticletext if sharedupload; text will be fetched from the
 	 * shared upload server if possible.
+	 * @return string
 	 */
 	public function getContent() {
 		$this->loadFile();
-		if( $this->img && !$this->img->isLocal() && 0 == $this->getID() ) {
+		if ( $this->mPage->getFile() && !$this->mPage->getFile()->isLocal() && 0 == $this->getID() ) {
 			return '';
 		}
-		return Article::getContent();
+		return parent::getContent();
 	}
 
 	protected function openShowImage() {
 		global $wgOut, $wgUser, $wgImageLimits, $wgRequest,
-			$wgLang, $wgContLang, $wgEnableUploads;
+			$wgLang, $wgEnableUploads, $wgSend404Code;
 
 		$this->loadFile();
 
-		$full_url  = $this->displayImg->getURL();
-		$linkAttribs = false;
-		$sizeSel = intval( $wgUser->getOption( 'imagesize') );
-		if( !isset( $wgImageLimits[$sizeSel] ) ) {
+		$sizeSel = intval( $wgUser->getOption( 'imagesize' ) );
+		if ( !isset( $wgImageLimits[$sizeSel] ) ) {
 			$sizeSel = User::getDefaultOption( 'imagesize' );
 
 			// The user offset might still be incorrect, specially if
 			// $wgImageLimits got changed (see bug #8858).
-			if( !isset( $wgImageLimits[$sizeSel] ) ) {
+			if ( !isset( $wgImageLimits[$sizeSel] ) ) {
 				// Default to the first offset in $wgImageLimits
 				$sizeSel = 0;
 			}
@@ -298,77 +280,83 @@ class ImagePage extends Article {
 		$max = $wgImageLimits[$sizeSel];
 		$maxWidth = $max[0];
 		$maxHeight = $max[1];
-		$sk = $wgUser->getSkin();
-		$dirmark = $wgContLang->getDirMark();
+		$dirmark = $wgLang->getDirMark();
 
-		if( $this->displayImg->exists() ) {
+		if ( $this->displayImg->exists() ) {
 			# image
 			$page = $wgRequest->getIntOrNull( 'page' );
-			if( is_null( $page ) ) {
+			if ( is_null( $page ) ) {
 				$params = array();
 				$page = 1;
 			} else {
 				$params = array( 'page' => $page );
 			}
-			$width_orig = $this->displayImg->getWidth();
+			$width_orig = $this->displayImg->getWidth( $page );
 			$width = $width_orig;
-			$height_orig = $this->displayImg->getHeight();
+			$height_orig = $this->displayImg->getHeight( $page );
 			$height = $height_orig;
-			$mime = $this->displayImg->getMimeType();
-			$showLink = false;
-			$linkAttribs = array( 'href' => $full_url );
-			$longDesc = $this->displayImg->getLongDesc();
 
-			wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this , &$wgOut ) )	;
+			$longDesc = wfMsg( 'parentheses', $this->displayImg->getLongDesc() );
+
+			wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this, &$wgOut ) );
 
-			if( $this->displayImg->allowInlineDisplay() ) {
+			if ( $this->displayImg->allowInlineDisplay() ) {
 				# image
 
 				# "Download high res version" link below the image
-				#$msgsize = wfMsgHtml('file-info-size', $width_orig, $height_orig, $sk->formatSize( $this->displayImg->getSize() ), $mime );
+				# $msgsize = wfMsgHtml( 'file-info-size', $width_orig, $height_orig, Linker::formatSize( $this->displayImg->getSize() ), $mime );
 				# We'll show a thumbnail of this image
-				if( $width > $maxWidth || $height > $maxHeight ) {
+				if ( $width > $maxWidth || $height > $maxHeight ) {
 					# Calculate the thumbnail size.
 					# First case, the limiting factor is the width, not the height.
-					if( $width / $height >= $maxWidth / $maxHeight ) {
-						$height = round( $height * $maxWidth / $width);
+					if ( $width / $height >= $maxWidth / $maxHeight ) {
+						$height = round( $height * $maxWidth / $width );
 						$width = $maxWidth;
 						# Note that $height <= $maxHeight now.
 					} else {
-						$newwidth = floor( $width * $maxHeight / $height);
+						$newwidth = floor( $width * $maxHeight / $height );
 						$height = round( $height * $newwidth / $width );
 						$width = $newwidth;
 						# Note that $height <= $maxHeight now, but might not be identical
 						# because of rounding.
 					}
 					$msgbig  = wfMsgHtml( 'show-big-image' );
-					$msgsmall = wfMsgExt( 'show-big-image-thumb', 'parseinline',
-						$wgLang->formatNum( $width ),
-						$wgLang->formatNum( $height )
-					);
+					$otherSizes = array();
+					foreach ( $wgImageLimits as $size ) {
+						if ( $size[0] < $width_orig && $size[1] < $height_orig &&
+								$size[0] != $width && $size[1] != $height ) {
+							$otherSizes[] = $this->makeSizeLink( $params, $size[0], $size[1] );
+						}
+					}
+					$msgsmall = wfMessage( 'show-big-image-preview' )->
+						rawParams( $this->makeSizeLink( $params, $width, $height ) )->
+						parse() . ' ' .
+						Html::rawElement( 'span', array( 'class' => 'mw-filepage-other-resolutions' ),
+							wfMessage( 'show-big-image-other' )->rawParams( $wgLang->pipeList( $otherSizes ) )->
+							params( count( $otherSizes ) )->parse()
+						);
+				} elseif ( $width == 0 && $height == 0 ){
+					# Some sort of audio file that doesn't have dimensions
+					# Don't output a no hi res message for such a file
+					$msgsmall = '';
 				} else {
 					# Image is small enough to show full size on image page
-					$msgbig = htmlspecialchars( $this->displayImg->getName() );
-					$msgsmall = wfMsgExt( 'file-nohires', array( 'parseinline' ) );
+					$msgsmall = wfMessage( 'file-nohires' )->parse();
 				}
 
 				$params['width'] = $width;
+				$params['height'] = $height;
 				$thumbnail = $this->displayImg->transform( $params );
 
-				$anchorclose = "<br />";
-				if( $this->displayImg->mustRender() ) {
-					$showLink = true;
-				} else {
-					$anchorclose .=
-						$msgsmall .
-						'<br />' . Xml::tags( 'a', $linkAttribs,  $msgbig ) . "$dirmark " . $longDesc;
-				}
+				$showLink = true;
+				$anchorclose = Html::rawElement( 'div', array( 'class' => 'mw-filepage-resolutioninfo' ), $msgsmall );
 
-				if( $this->displayImg->isMultipage() ) {
+				$isMulti = $this->displayImg->isMultipage() && $this->displayImg->pageCount() > 1;
+				if ( $isMulti ) {
 					$wgOut->addHTML( '<table class="multipageimage"><tr><td>' );
 				}
 
-				if( $thumbnail ) {
+				if ( $thumbnail ) {
 					$options = array(
 						'alt' => $this->displayImg->getTitle()->getPrefixedText(),
 						'file-link' => true,
@@ -378,34 +366,34 @@ class ImagePage extends Article {
 						$anchorclose . "</div>\n" );
 				}
 
-				if( $this->displayImg->isMultipage() ) {
+				if ( $isMulti ) {
 					$count = $this->displayImg->pageCount();
 
-					if( $page > 1 ) {
+					if ( $page > 1 ) {
 						$label = $wgOut->parse( wfMsg( 'imgmultipageprev' ), false );
-						$link = $sk->link(
-							$this->mTitle,
+						$link = Linker::link(
+							$this->getTitle(),
 							$label,
 							array(),
 							array( 'page' => $page - 1 ),
 							array( 'known', 'noclasses' )
 						);
-						$thumb1 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none',
+						$thumb1 = Linker::makeThumbLinkObj( $this->getTitle(), $this->displayImg, $link, $label, 'none',
 							array( 'page' => $page - 1 ) );
 					} else {
 						$thumb1 = '';
 					}
 
-					if( $page < $count ) {
+					if ( $page < $count ) {
 						$label = wfMsg( 'imgmultipagenext' );
-						$link = $sk->link(
-							$this->mTitle,
+						$link = Linker::link(
+							$this->getTitle(),
 							$label,
 							array(),
 							array( 'page' => $page + 1 ),
 							array( 'known', 'noclasses' )
 						);
-						$thumb2 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none',
+						$thumb2 = Linker::makeThumbLinkObj( $this->getTitle(), $this->displayImg, $link, $label, 'none',
 							array( 'page' => $page + 1 ) );
 					} else {
 						$thumb2 = '';
@@ -418,10 +406,9 @@ class ImagePage extends Article {
 						'action' => $wgScript,
 						'onchange' => 'document.pageselector.submit();',
 					);
-
-					$option = array();
-					for ( $i=1; $i <= $count; $i++ ) {
-						$options[] = Xml::option( $wgLang->formatNum($i), $i, $i == $page );
+					$options = array();
+					for ( $i = 1; $i <= $count; $i++ ) {
+						$options[] = Xml::option( $wgLang->formatNum( $i ), $i, $i == $page );
 					}
 					$select = Xml::tags( 'select',
 						array( 'id' => 'pageselector', 'name' => 'page' ),
@@ -430,53 +417,51 @@ class ImagePage extends Article {
 					$wgOut->addHTML(
 						'</td><td><div class="multipageimagenavbox">' .
 						Xml::openElement( 'form', $formParams ) .
-						Xml::hidden( 'title', $this->getTitle()->getPrefixedDbKey() ) .
+						Html::hidden( 'title', $this->getTitle()->getPrefixedDBkey() ) .
 						wfMsgExt( 'imgmultigoto', array( 'parseinline', 'replaceafter' ), $select ) .
 						Xml::submitButton( wfMsg( 'imgmultigo' ) ) .
 						Xml::closeElement( 'form' ) .
-						"<hr />$thumb1\n$thumb2<br clear=\"all\" /></div></td></tr></table>"
+						"<hr />$thumb1\n$thumb2<br style=\"clear: both\" /></div></td></tr></table>"
 					);
 				}
 			} else {
-				#if direct link is allowed but it's not a renderable image, show an icon.
-				if( $this->displayImg->isSafeFile() ) {
-					$icon= $this->displayImg->iconThumb();
+				# if direct link is allowed but it's not a renderable image, show an icon.
+				if ( $this->displayImg->isSafeFile() ) {
+					$icon = $this->displayImg->iconThumb();
 
 					$wgOut->addHTML( '<div class="fullImageLink" id="file">' .
-					$icon->toHtml( array( 'file-link' => true ) ) .
-					"</div>\n" );
+						$icon->toHtml( array( 'file-link' => true ) ) .
+						"</div>\n" );
 				}
 
 				$showLink = true;
 			}
 
-
-			if($showLink) {
+			if ( $showLink ) {
 				$filename = wfEscapeWikiText( $this->displayImg->getName() );
-				$medialink = "[[Media:$filename|$filename]]";
+				$linktext = $filename;
+				if ( isset( $msgbig ) ) {
+					$linktext = wfEscapeWikiText( $msgbig );
+				}
+				$medialink = "[[Media:$filename|$linktext]]";
 
-				if( !$this->displayImg->isSafeFile() ) {
+				if ( !$this->displayImg->isSafeFile() ) {
 					$warning = wfMsgNoTrans( 'mediawarning' );
 					$wgOut->addWikiText( <<<EOT
-<div class="fullMedia">
-<span class="dangerousLink">{$medialink}</span>$dirmark
-<span class="fileInfo">$longDesc</span>
-</div>
+<div class="fullMedia"><span class="dangerousLink">{$medialink}</span>$dirmark <span class="fileInfo">$longDesc</span></div>
 <div class="mediaWarning">$warning</div>
 EOT
 						);
 				} else {
 					$wgOut->addWikiText( <<<EOT
-<div class="fullMedia">
-{$medialink}{$dirmark}
-<span class="fileInfo">$longDesc</span>
+<div class="fullMedia">{$medialink}{$dirmark} <span class="fileInfo">$longDesc</span>
 </div>
 EOT
 					);
 				}
 			}
 
-			if( !$this->displayImg->isLocal() ) {
+			if ( !$this->displayImg->isLocal() ) {
 				$this->printSharedImageText();
 			}
 		} else {
@@ -486,15 +471,45 @@ EOT
 				$uploadTitle = SpecialPage::getTitleFor( 'Upload' );
 				$nofile = array(
 					'filepage-nofile-link',
-					$uploadTitle->getFullUrl( array( 'wpDestFile' => $this->img->getName() ) )
+					$uploadTitle->getFullURL( array( 'wpDestFile' => $this->mPage->getFile()->getName() ) )
 				);
-			}
-			else
-			{
+			} else {
 				$nofile = 'filepage-nofile';
 			}
+			// Note, if there is an image description page, but
+			// no image, then this setRobotPolicy is overriden
+			// by Article::View().
 			$wgOut->setRobotPolicy( 'noindex,nofollow' );
 			$wgOut->wrapWikiMsg( "<div id='mw-imagepage-nofile' class='plainlinks'>\n$1\n</div>", $nofile );
+			if ( !$this->getID() && $wgSend404Code ) {
+				// If there is no image, no shared image, and no description page,
+				// output a 404, to be consistent with articles.
+				$wgRequest->response()->header( 'HTTP/1.1 404 Not Found' );
+			}
+		}
+		$wgOut->setFileVersion( $this->displayImg );
+	}
+
+	/**
+	 * Creates an thumbnail of specified size and returns an HTML link to it
+	 * @param $params array Scaler parameters
+	 * @param $width int
+	 * @param $height int
+	 * @return string
+	 */
+	private function makeSizeLink( $params, $width, $height ) {
+		$params['width'] = $width;
+		$params['height'] = $height;
+		$thumbnail = $this->displayImg->transform( $params );
+		if ( $thumbnail && !$thumbnail->isError() ) {
+			return Html::rawElement( 'a', array(
+				'href' => $thumbnail->getUrl(),
+				'class' => 'mw-thumbnail-link'
+				), wfMessage( 'show-big-image-size' )->numParams(
+					$thumbnail->getWidth(), $thumbnail->getHeight()
+				)->parse() );
+		} else {
+			return '';
 		}
 	}
 
@@ -506,14 +521,18 @@ EOT
 
 		$this->loadFile();
 
-		$descUrl = $this->img->getDescriptionUrl();
-		$descText = $this->img->getDescriptionText();
+		$descUrl = $this->mPage->getFile()->getDescriptionUrl();
+		$descText = $this->mPage->getFile()->getDescriptionText();
+
+		/* Add canonical to head if there is no local page for this shared file */
+		if( $descUrl && $this->mPage->getID() == 0 ) {
+			$wgOut->addLink( array( 'rel' => 'canonical', 'href' => $descUrl ) );
+		}
 
 		$wrap = "<div class=\"sharedUploadNotice\">\n$1\n</div>\n";
-		$repo = $this->img->getRepo()->getDisplayName();
+		$repo = $this->mPage->getFile()->getRepo()->getDisplayName();
 
-		$msg = '';
-		if( $descUrl && $descText && wfMsgNoTrans( 'sharedupload-desc-here' ) !== '-'  ) {
+		if ( $descUrl && $descText && wfMsgNoTrans( 'sharedupload-desc-here' ) !== '-'  ) {
 			$wgOut->wrapWikiMsg( $wrap, array( 'sharedupload-desc-here', $repo, $descUrl ) );
 		} elseif ( $descUrl && wfMsgNoTrans( 'sharedupload-desc-there' ) !== '-' ) {
 			$wgOut->wrapWikiMsg( $wrap, array( 'sharedupload-desc-there', $repo, $descUrl ) );
@@ -521,7 +540,7 @@ EOT
 			$wgOut->wrapWikiMsg( $wrap, array( 'sharedupload', $repo ), ''/*BACKCOMPAT*/ );
 		}
 
-		if( $descText ) {
+		if ( $descText ) {
 			$this->mExtraDescription = $descText;
 		}
 	}
@@ -529,8 +548,8 @@ EOT
 	public function getUploadUrl() {
 		$this->loadFile();
 		$uploadTitle = SpecialPage::getTitleFor( 'Upload' );
-		return $uploadTitle->getFullUrl( array(
-			'wpDestFile' => $this->img->getName(),
+		return $uploadTitle->getFullURL( array(
+			'wpDestFile' => $this->mPage->getFile()->getName(),
 			'wpForReUpload' => 1
 		 ) );
 	}
@@ -540,168 +559,215 @@ EOT
 	 * external editing (and instructions link) etc.
 	 */
 	protected function uploadLinksBox() {
-		global $wgUser, $wgOut, $wgEnableUploads;
+		global $wgUser, $wgOut, $wgEnableUploads, $wgUseExternalEditor;
 
-		if( !$wgEnableUploads ) { return; }
+		if ( !$wgEnableUploads ) {
+			return;
+		}
 
 		$this->loadFile();
-		if( !$this->img->isLocal() )
+		if ( !$this->mPage->getFile()->isLocal() ) {
 			return;
-
-		$sk = $wgUser->getSkin();
+		}
 
 		$wgOut->addHTML( "<br /><ul>\n" );
 
 		# "Upload a new version of this file" link
-		if( UploadBase::userCanReUpload($wgUser,$this->img->name) ) {
-			$ulink = $sk->makeExternalLink( $this->getUploadUrl(), wfMsg( 'uploadnewversion-linktext' ) );
+		if ( UploadBase::userCanReUpload( $wgUser, $this->mPage->getFile()->name ) ) {
+			$ulink = Linker::makeExternalLink( $this->getUploadUrl(), wfMsg( 'uploadnewversion-linktext' ) );
 			$wgOut->addHTML( "<li id=\"mw-imagepage-reupload-link\"><div class=\"plainlinks\">{$ulink}</div></li>\n" );
 		}
 
 		# External editing link
-		$elink = $sk->link(
-			$this->mTitle,
-			wfMsgHtml( 'edit-externally' ),
-			array(),
-			array(
-				'action' => 'edit',
-				'externaledit' => 'true',
-				'mode' => 'file'
-			),
-			array( 'known', 'noclasses' )
-		);
-		$wgOut->addHTML( '<li id="mw-imagepage-edit-external">' . $elink . ' <small>' . wfMsgExt( 'edit-externally-help', array( 'parseinline' ) ) . "</small></li>\n" );
+		if ( $wgUseExternalEditor ) {
+			$elink = Linker::link(
+				$this->getTitle(),
+				wfMsgHtml( 'edit-externally' ),
+				array(),
+				array(
+					'action' => 'edit',
+					'externaledit' => 'true',
+					'mode' => 'file'
+				),
+				array( 'known', 'noclasses' )
+			);
+			$wgOut->addHTML(
+				'<li id="mw-imagepage-edit-external">' . $elink . ' <small>' .
+				wfMsgExt( 'edit-externally-help', array( 'parseinline' ) ) .
+				"</small></li>\n"
+			);
+		}
 
 		$wgOut->addHTML( "</ul>\n" );
 	}
 
-	protected function closeShowImage() {} # For overloading
+	protected function closeShowImage() { } # For overloading
 
 	/**
 	 * If the page we've just displayed is in the "Image" namespace,
 	 * we follow it with an upload history of the image and its usage.
 	 */
 	protected function imageHistory() {
-		global $wgOut, $wgUseExternalEditor;
+		global $wgOut;
 
 		$this->loadFile();
 		$pager = new ImageHistoryPseudoPager( $this );
 		$wgOut->addHTML( $pager->getBody() );
+		$wgOut->preventClickjacking( $pager->getPreventClickjacking() );
 
-		$this->img->resetHistory(); // free db resources
+		$this->mPage->getFile()->resetHistory(); // free db resources
 
 		# Exist check because we don't want to show this on pages where an image
 		# doesn't exist along with the noimage message, that would suck. -ævar
-		if( $wgUseExternalEditor && $this->img->exists() ) {
+		if ( $this->mPage->getFile()->exists() ) {
 			$this->uploadLinksBox();
 		}
 	}
 
-	protected function imageLinks() {
-		global $wgUser, $wgOut, $wgLang;
-
-		$limit = 100;
-
+	/**
+	 * @param $target
+	 * @param $limit
+	 * @return ResultWrapper
+	 */
+	protected function queryImageLinks( $target, $limit ) {
 		$dbr = wfGetDB( DB_SLAVE );
 
-		$res = $dbr->select(
+		return $dbr->select(
 			array( 'imagelinks', 'page' ),
-			array( 'page_namespace', 'page_title' ),
-			array( 'il_to' => $this->mTitle->getDBkey(), 'il_from = page_id' ),
+			array( 'page_namespace', 'page_title', 'page_is_redirect', 'il_to' ),
+			array( 'il_to' => $target, 'il_from = page_id' ),
 			__METHOD__,
-			array( 'LIMIT' => $limit + 1)	
+			array( 'LIMIT' => $limit + 1, 'ORDER BY' => 'il_from', )
 		);
-		$count = $dbr->numRows( $res );
-		if( $count == 0 ) {
-			$wgOut->addHTML( "<div id='mw-imagepage-nolinkstoimage'>\n" );
-			$wgOut->addWikiMsg( 'nolinkstoimage' );
-			$wgOut->addHTML( "</div>\n" );
+	}
+
+	protected function imageLinks() {
+		global $wgOut, $wgLang;
+
+		$limit = 100;
+
+		$res = $this->queryImageLinks( $this->getTitle()->getDbKey(), $limit + 1);
+		$rows = array();
+		$redirects = array();
+		foreach ( $res as $row ) {
+			if ( $row->page_is_redirect ) {
+				$redirects[$row->page_title] = array();
+			}
+			$rows[] = $row;
+		}
+		$count = count( $rows );
+
+		$hasMore = $count > $limit;
+		if ( !$hasMore && count( $redirects ) ) {
+			$res = $this->queryImageLinks( array_keys( $redirects ),
+				$limit - count( $rows ) + 1 );
+			foreach ( $res as $row ) {
+				$redirects[$row->il_to][] = $row;
+				$count++;
+			}
+			$hasMore = ( $res->numRows() + count( $rows ) ) > $limit;
+		}
+
+		if ( $count == 0 ) {
+			$wgOut->wrapWikiMsg(
+				Html::rawElement( 'div',
+					array( 'id' => 'mw-imagepage-nolinkstoimage' ), "\n$1\n" ),
+				'nolinkstoimage'
+			);
 			return;
 		}
-		
+
 		$wgOut->addHTML( "<div id='mw-imagepage-section-linkstoimage'>\n" );
-		if( $count <= $limit - 1 ) {
+		if ( !$hasMore ) {
 			$wgOut->addWikiMsg( 'linkstoimage', $count );
 		} else {
 			// More links than the limit. Add a link to [[Special:Whatlinkshere]]
 			$wgOut->addWikiMsg( 'linkstoimage-more',
 				$wgLang->formatNum( $limit ),
-				$this->mTitle->getPrefixedDBkey()
+				$this->getTitle()->getPrefixedDBkey()
 			);
 		}
 
-		$wgOut->addHTML( "<ul class='mw-imagepage-linkstoimage'>\n" );
-		$sk = $wgUser->getSkin();
+		$wgOut->addHTML(
+			Html::openElement( 'ul',
+				array( 'class' => 'mw-imagepage-linkstoimage' ) ) . "\n"
+		);
 		$count = 0;
-		while ( $s = $res->fetchObject() ) {
-			$count++;
-			if( $count <= $limit ) {
-				// We have not yet reached the extra one that tells us there is more to fetch
-				$link = $sk->link(
-					Title::makeTitle( $s->page_namespace, $s->page_title ),
-					null,
-					array(),
-					array(),
-					array( 'known', 'noclasses' )
-				);
-				$wgOut->addHTML( "<li>{$link}</li>\n" );
-			}
-		}
-		$wgOut->addHTML( "</ul>\n" );
-		$res->free();
 
-		// Add a links to [[Special:Whatlinkshere]]
-		if( $count > $limit )
-			$wgOut->addWikiMsg( 'morelinkstoimage', $this->mTitle->getPrefixedDBkey() );
-		$wgOut->addHTML( "</div>\n" );
-	}
-	
-	protected function imageRedirects() {
-		global $wgUser, $wgOut, $wgLang;
+		// Sort the list by namespace:title
+		usort( $rows, array( $this, 'compare' ) );
 
-		$redirects = $this->getTitle()->getRedirectsHere( NS_FILE );
-		if( count( $redirects ) == 0 ) return;
+		// Create links for every element
+		$currentCount = 0;
+		foreach( $rows as $element ) {
+			$currentCount++;
+			if ( $currentCount > $limit ) {
+				break;
+			}
 
-		$wgOut->addHTML( "<div id='mw-imagepage-section-redirectstofile'>\n" );
-		$wgOut->addWikiMsg( 'redirectstofile',
-			$wgLang->formatNum( count( $redirects ) )
-		);
-		$wgOut->addHTML( "<ul class='mw-imagepage-redirectstofile'>\n" );
+			$link = Linker::linkKnown( Title::makeTitle( $element->page_namespace, $element->page_title ) );
+			if ( !isset( $redirects[$element->page_title] ) ) {
+				$liContents = $link;
+			} else {
+				$ul = "<ul class='mw-imagepage-redirectstofile'>\n";
+				foreach ( $redirects[$element->page_title] as $row ) {
+					$currentCount++;
+					if ( $currentCount > $limit ) {
+						break;
+					}
 
-		$sk = $wgUser->getSkin();
-		foreach ( $redirects as $title ) {
-			$link = $sk->link(
-				$title,
-				null,
-				array(),
-				array( 'redirect' => 'no' ),
-				array( 'known', 'noclasses' )
+					$link2 = Linker::linkKnown( Title::makeTitle( $row->page_namespace, $row->page_title ) );
+					$ul .= Html::rawElement(
+						'li',
+						array( 'id' => 'mw-imagepage-linkstoimage-ns' . $element->page_namespace ),
+						$link2
+						) . "\n";
+				}
+				$ul .= '</ul>';
+				$liContents = wfMessage( 'linkstoimage-redirect' )->rawParams(
+					$link, $ul )->parse();
+			}
+			$wgOut->addHTML( Html::rawElement(
+					'li',
+					array( 'id' => 'mw-imagepage-linkstoimage-ns' . $element->page_namespace ),
+					$liContents
+				) . "\n"
 			);
-			$wgOut->addHTML( "<li>{$link}</li>\n" );
-		}
-		$wgOut->addHTML( "</ul></div>\n" );
 
+		};
+		$wgOut->addHTML( Html::closeElement( 'ul' ) . "\n" );
+		$res->free();
+
+		// Add a links to [[Special:Whatlinkshere]]
+		if ( $count > $limit ) {
+			$wgOut->addWikiMsg( 'morelinkstoimage', $this->getTitle()->getPrefixedDBkey() );
+		}
+		$wgOut->addHTML( Html::closeElement( 'div' ) . "\n" );
 	}
 
 	protected function imageDupes() {
-		global $wgOut, $wgUser, $wgLang;
+		global $wgOut, $wgLang;
 
 		$this->loadFile();
 
-		$dupes = $this->getDuplicates();
-		if( count( $dupes ) == 0 ) return;
+		$dupes = $this->mPage->getDuplicates();
+		if ( count( $dupes ) == 0 ) {
+			return;
+		}
 
 		$wgOut->addHTML( "<div id='mw-imagepage-section-duplicates'>\n" );
 		$wgOut->addWikiMsg( 'duplicatesoffile',
-			$wgLang->formatNum( count( $dupes ) ), $this->mTitle->getDBkey()
+			$wgLang->formatNum( count( $dupes ) ), $this->getTitle()->getDBkey()
 		);
 		$wgOut->addHTML( "<ul class='mw-imagepage-duplicates'>\n" );
 
-		$sk = $wgUser->getSkin();
+		/**
+		 * @var $file File
+		 */
 		foreach ( $dupes as $file ) {
 			$fromSrc = '';
-			if( $file->isLocal() ) {
-				$link = $sk->link(
+			if ( $file->isLocal() ) {
+				$link = Linker::link(
 					$file->getTitle(),
 					null,
 					array(),
@@ -709,7 +775,7 @@ EOT
 					array( 'known', 'noclasses' )
 				);
 			} else {
-				$link = $sk->makeExternalLink( $file->getDescriptionUrl(),
+				$link = Linker::makeExternalLink( $file->getDescriptionUrl(),
 					$file->getTitle()->getPrefixedText() );
 				$fromSrc = wfMsg( 'shared-repo-from', $file->getRepo()->getDisplayName() );
 			}
@@ -722,64 +788,46 @@ EOT
 	 * Delete the file, or an earlier version of it
 	 */
 	public function delete() {
-		global $wgUploadMaintenance;
-		if( $wgUploadMaintenance && $this->mTitle && $this->mTitle->getNamespace() == NS_FILE ) {
-			global $wgOut;
-			$wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n", array( 'filedelete-maintenance' ) );
-			return;
-		}
-
-		$this->loadFile();
-		if( !$this->img->exists() || !$this->img->isLocal() || $this->img->getRedirected() ) {
+		$file = $this->mPage->getFile();
+		if ( !$file->exists() || !$file->isLocal() || $file->getRedirected() ) {
 			// Standard article deletion
-			Article::delete();
+			parent::delete();
 			return;
 		}
-		$deleter = new FileDeleteForm( $this->img );
-		$deleter->execute();
-	}
-
-	/**
-	 * Revert the file to an earlier version
-	 */
-	public function revert() {
-		$this->loadFile();
-		$reverter = new FileRevertForm( $this->img );
-		$reverter->execute();
-	}
 
-	/**
-	 * Override handling of action=purge
-	 */
-	public function doPurge() {
-		$this->loadFile();
-		if( $this->img->exists() ) {
-			wfDebug( "ImagePage::doPurge purging " . $this->img->getName() . "\n" );
-			$update = new HTMLCacheUpdate( $this->mTitle, 'imagelinks' );
-			$update->doUpdate();
-			$this->img->upgradeRow();
-			$this->img->purgeCache();
-		} else {
-			wfDebug( "ImagePage::doPurge no image for " . $this->img->getName() . "; limiting purge to cache only\n" );
-			// even if the file supposedly doesn't exist, force any cached information
-			// to be updated (in case the cached information is wrong)
-			$this->img->purgeCache();
-		}
-		parent::doPurge();
+		$deleter = new FileDeleteForm( $file );
+		$deleter->execute();
 	}
 
 	/**
 	 * Display an error with a wikitext description
+	 *
+	 * @param $description String
 	 */
 	function showError( $description ) {
 		global $wgOut;
-		$wgOut->setPageTitle( wfMsg( "internalerror" ) );
-		$wgOut->setRobotPolicy( "noindex,nofollow" );
+		$wgOut->setPageTitle( wfMessage( 'internalerror' ) );
+		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$wgOut->setArticleRelated( false );
 		$wgOut->enableClientCache( false );
 		$wgOut->addWikiText( $description );
 	}
 
+	/**
+	 * Callback for usort() to do link sorts by (namespace, title)
+	 * Function copied from Title::compare()
+	 *
+	 * @param $a object page to compare with
+	 * @param $b object page to compare with
+	 * @return Integer: result of string comparison, or namespace comparison
+	 */
+	protected function compare( $a, $b ) {
+		if ( $a->page_namespace == $b->page_namespace ) {
+			return strcmp( $a->page_title, $b->page_title );
+		} else {
+			return $a->page_namespace - $b->page_namespace;
+		}
+	}
 }
 
 /**
@@ -789,11 +837,34 @@ EOT
  */
 class ImageHistoryList {
 
-	protected $imagePage, $img, $skin, $title, $repo, $showThumb;
+	/**
+	 * @var Title
+	 */
+	protected $title;
+
+	/**
+	 * @var File
+	 */
+	protected $img;
+
+	/**
+	 * @var ImagePage
+	 */
+	protected $imagePage;
+
+	/**
+	 * @var File
+	 */
+	protected $current;
+
+	protected $repo, $showThumb;
+	protected $preventClickjacking = false;
 
+	/**
+	 * @param ImagePage $imagePage
+	 */
 	public function __construct( $imagePage ) {
-		global $wgUser, $wgShowArchiveThumbnails;
-		$this->skin = $wgUser->getSkin();
+		global $wgShowArchiveThumbnails;
 		$this->current = $imagePage->getFile();
 		$this->img = $imagePage->getDisplayedFile();
 		$this->title = $imagePage->getTitle();
@@ -801,18 +872,24 @@ class ImageHistoryList {
 		$this->showThumb = $wgShowArchiveThumbnails && $this->img->canRender();
 	}
 
+	/**
+	 * @return ImagePage
+	 */
 	public function getImagePage() {
 		return $this->imagePage;
 	}
 
-	public function getSkin() {
-		return $this->skin;
-	}
-
+	/**
+	 * @return File
+	 */
 	public function getFile() {
 		return $this->img;
 	}
 
+	/**
+	 * @param $navLinks string
+	 * @return string
+	 */
 	public function beginImageHistoryList( $navLinks = '' ) {
 		global $wgOut, $wgUser;
 		return Xml::element( 'h2', array( 'id' => 'filehistory' ), wfMsg( 'filehist' ) ) . "\n"
@@ -821,7 +898,7 @@ class ImageHistoryList {
 			. $navLinks . "\n"
 			. Xml::openElement( 'table', array( 'class' => 'wikitable filehistory' ) ) . "\n"
 			. '<tr><td></td>'
-			. ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deletedhistory') ) ? '<td></td>' : '' )
+			. ( $this->current->isLocal() && ( $wgUser->isAllowedAny( 'delete', 'deletedhistory' ) ) ? '<td></td>' : '' )
 			. '<th>' . wfMsgHtml( 'filehist-datetime' ) . '</th>'
 			. ( $this->showThumb ? '<th>' . wfMsgHtml( 'filehist-thumb' ) . '</th>' : '' )
 			. '<th>' . wfMsgHtml( 'filehist-dimensions' ) . '</th>'
@@ -830,82 +907,86 @@ class ImageHistoryList {
 			. "</tr>\n";
 	}
 
+	/**
+	 * @param $navLinks string
+	 * @return string
+	 */
 	public function endImageHistoryList( $navLinks = '' ) {
 		return "</table>\n$navLinks\n</div>\n";
 	}
 
+	/**
+	 * @param $iscur
+	 * @param $file File
+	 * @return string
+	 */
 	public function imageHistoryLine( $iscur, $file ) {
-		global $wgUser, $wgLang, $wgContLang, $wgTitle;
+		global $wgUser, $wgLang, $wgContLang;
 
-		$timestamp = wfTimestamp(TS_MW, $file->getTimestamp());
+		$timestamp = wfTimestamp( TS_MW, $file->getTimestamp() );
 		$img = $iscur ? $file->getName() : $file->getArchiveName();
-		$user = $file->getUser('id');
-		$usertext = $file->getUser('text');
+		$user = $file->getUser( 'id' );
+		$usertext = $file->getUser( 'text' );
 		$description = $file->getDescription();
 
 		$local = $this->current->isLocal();
-		$row = $css = $selected = '';
+		$row = $selected = '';
 
 		// Deletion link
-		if( $local && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deletedhistory') ) ) {
+		if ( $local && ( $wgUser->isAllowedAny( 'delete', 'deletedhistory' ) ) ) {
 			$row .= '<td>';
 			# Link to remove from history
-			if( $wgUser->isAllowed( 'delete' ) ) {
+			if ( $wgUser->isAllowed( 'delete' ) ) {
 				$q = array( 'action' => 'delete' );
-				if( !$iscur )
+				if ( !$iscur ) {
 					$q['oldimage'] = $img;
-				$row .= $this->skin->link(
+				}
+				$row .= Linker::link(
 					$this->title,
 					wfMsgHtml( $iscur ? 'filehist-deleteall' : 'filehist-deleteone' ),
 					array(), $q, array( 'known' )
 				);
 			}
 			# Link to hide content. Don't show useless link to people who cannot hide revisions.
-			if( $wgUser->isAllowed('deleterevision') || ($wgUser->isAllowed('deletedhistory') && $file->getVisibility()) ) {
-				if( $wgUser->isAllowed('delete') ) {
-					$row .= '<br/>';
+			$canHide = $wgUser->isAllowed( 'deleterevision' );
+			if ( $canHide || ( $wgUser->isAllowed( 'deletedhistory' ) && $file->getVisibility() ) ) {
+				if ( $wgUser->isAllowed( 'delete' ) ) {
+					$row .= '<br />';
 				}
 				// If file is top revision or locked from this user, don't link
-				if( $iscur || !$file->userCan(File::DELETED_RESTRICTED) ) {
-					$del = wfMsgHtml( 'rev-delundel' );
+				if ( $iscur || !$file->userCan( File::DELETED_RESTRICTED ) ) {
+					$del = Linker::revDeleteLinkDisabled( $canHide );
 				} else {
 					list( $ts, $name ) = explode( '!', $img, 2 );
-					$del = $this->skin->link(
-						SpecialPage::getTitleFor( 'Revisiondelete' ),
-						wfMsgHtml( 'rev-delundel' ),
-						array(),
-						array( 
-							'type' => 'oldimage',
-							'target' => $wgTitle->getPrefixedText(), 
-							'ids' => $ts,
-						),
-						array( 'known' )
+					$query = array(
+						'type'   => 'oldimage',
+						'target' => $this->title->getPrefixedText(),
+						'ids'    => $ts,
 					);
-					// Bolden oversighted content
-					if( $file->isDeleted(File::DELETED_RESTRICTED) )
-						$del = "<strong>$del</strong>";
+					$del = Linker::revDeleteLink( $query,
+						$file->isDeleted( File::DELETED_RESTRICTED ), $canHide );
 				}
-				$row .= "<span class='mw-revdelundel-link'>$del</span>";
+				$row .= $del;
 			}
 			$row .= '</td>';
 		}
 
 		// Reversion link/current indicator
 		$row .= '<td>';
-		if( $iscur ) {
+		if ( $iscur ) {
 			$row .= wfMsgHtml( 'filehist-current' );
-		} elseif( $local && $wgUser->isLoggedIn() && $this->title->userCan( 'edit' ) ) {
-			if( $file->isDeleted(File::DELETED_FILE) ) {
-				$row .= wfMsgHtml('filehist-revert');
+		} elseif ( $local && $wgUser->isLoggedIn() && $this->title->userCan( 'edit' ) ) {
+			if ( $file->isDeleted( File::DELETED_FILE ) ) {
+				$row .= wfMsgHtml( 'filehist-revert' );
 			} else {
-				$row .= $this->skin->link(
+				$row .= Linker::link(
 					$this->title,
 					wfMsgHtml( 'filehist-revert' ),
 					array(),
 					array(
 						'action' => 'revert',
 						'oldimage' => $img,
-						'wpEditToken' => $wgUser->editToken( $img )
+						'wpEditToken' => $wgUser->getEditToken( $img )
 					),
 					array( 'known', 'noclasses' )
 				);
@@ -914,28 +995,33 @@ class ImageHistoryList {
 		$row .= '</td>';
 
 		// Date/time and image link
-		if( $file->getTimestamp() === $this->img->getTimestamp() ) {
+		if ( $file->getTimestamp() === $this->img->getTimestamp() ) {
 			$selected = "class='filehistory-selected'";
 		}
 		$row .= "<td $selected style='white-space: nowrap;'>";
-		if( !$file->userCan(File::DELETED_FILE) ) {
+		if ( !$file->userCan( File::DELETED_FILE ) ) {
 			# Don't link to unviewable files
 			$row .= '<span class="history-deleted">' . $wgLang->timeAndDate( $timestamp, true ) . '</span>';
-		} elseif( $file->isDeleted(File::DELETED_FILE) ) {
-			$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
-			# Make a link to review the image
-			$url = $this->skin->link(
-				$revdel,
-				$wgLang->timeAndDate( $timestamp, true ),
-				array(),
-				array(
-					'target' => $wgTitle->getPrefixedText(),
-					'file' => $img,
-					'token' => $wgUser->editToken( $img )
-				),
-				array( 'known', 'noclasses' )
-			);
-			$row .= '<span class="history-deleted">'.$url.'</span>';
+		} elseif ( $file->isDeleted( File::DELETED_FILE ) ) {
+			if ( $local ) {
+				$this->preventClickjacking();
+				$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
+				# Make a link to review the image
+				$url = Linker::link(
+					$revdel,
+					$wgLang->timeAndDate( $timestamp, true ),
+					array(),
+					array(
+						'target' => $this->title->getPrefixedText(),
+						'file' => $img,
+						'token' => $wgUser->getEditToken( $img )
+					),
+					array( 'known', 'noclasses' )
+				);
+			} else {
+				$url = $wgLang->timeAndDate( $timestamp, true );
+			}
+			$row .= '<span class="history-deleted">' . $url . '</span>';
 		} else {
 			$url = $iscur ? $this->current->getUrl() : $this->current->getArchiveUrl( $img );
 			$row .= Xml::element( 'a', array( 'href' => $url ), $wgLang->timeAndDate( $timestamp, true ) );
@@ -950,47 +1036,51 @@ class ImageHistoryList {
 		// Image dimensions + size
 		$row .= '<td>';
 		$row .= htmlspecialchars( $file->getDimensionsString() );
-		$row .= " <span style='white-space: nowrap;'>(" . $this->skin->formatSize( $file->getSize() ) . ')</span>';
+		$row .= ' <span style="white-space: nowrap;">(' . Linker::formatSize( $file->getSize() ) . ')</span>';
 		$row .= '</td>';
 
 		// Uploading user
 		$row .= '<td>';
-		if( $local ) {
-			// Hide deleted usernames
-			if( $file->isDeleted(File::DELETED_USER) ) {
-				$row .= '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
+		// Hide deleted usernames
+		if ( $file->isDeleted( File::DELETED_USER ) ) {
+			$row .= '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
+		} else {
+			if ( $local ) {
+				$row .= Linker::userLink( $user, $usertext ) . ' <span style="white-space: nowrap;">' .
+				Linker::userToolLinks( $user, $usertext ) . '</span>';
 			} else {
-				$row .= $this->skin->userLink( $user, $usertext ) . " <span style='white-space: nowrap;'>" . 
-					$this->skin->userToolLinks( $user, $usertext ) . "</span>";
+				$row .= htmlspecialchars( $usertext );
 			}
-		} else {
-			$row .= htmlspecialchars( $usertext );
 		}
-		$row .= '</td><td>';
+		$row .= '</td>';
 
 		// Don't show deleted descriptions
-		if( $file->isDeleted(File::DELETED_COMMENT) ) {
-			$row .= '<span class="history-deleted">' . wfMsgHtml('rev-deleted-comment') . '</span>';
+		if ( $file->isDeleted( File::DELETED_COMMENT ) ) {
+			$row .= '<td><span class="history-deleted">' . wfMsgHtml( 'rev-deleted-comment' ) . '</span></td>';
 		} else {
-			$row .= $this->skin->commentBlock( $description, $this->title );
+			$row .= '<td dir="' . $wgContLang->getDir() . '">' . Linker::formatComment( $description, $this->title ) . '</td>';
 		}
-		$row .= '</td>';
 
+		$rowClass = null;
 		wfRunHooks( 'ImagePageFileHistoryLine', array( $this, $file, &$row, &$rowClass ) );
-		$classAttr = $rowClass ? " class='$rowClass'" : "";
+		$classAttr = $rowClass ? " class='$rowClass'" : '';
 
 		return "<tr{$classAttr}>{$row}</tr>\n";
 	}
 
+	/**
+	 * @param $file File
+	 * @return string
+	 */
 	protected function getThumbForLine( $file ) {
 		global $wgLang;
 
-		if( $file->allowInlineDisplay() && $file->userCan( File::DELETED_FILE ) && !$file->isDeleted( File::DELETED_FILE ) ) {
+		if ( $file->allowInlineDisplay() && $file->userCan( File::DELETED_FILE ) && !$file->isDeleted( File::DELETED_FILE ) ) {
 			$params = array(
 				'width' => '120',
 				'height' => '120',
 			);
-			$timestamp = wfTimestamp(TS_MW, $file->getTimestamp());
+			$timestamp = wfTimestamp( TS_MW, $file->getTimestamp() );
 
 			$thumbnail = $file->transform( $params );
 			$options = array(
@@ -1000,27 +1090,61 @@ class ImageHistoryList {
 					$wgLang->time( $timestamp, true ) ),
 				'file-link' => true,
 			);
-			
-			if ( !$thumbnail ) return wfMsgHtml( 'filehist-nothumb' );
+
+			if ( !$thumbnail ) {
+				return wfMsgHtml( 'filehist-nothumb' );
+			}
 
 			return $thumbnail->toHtml( $options );
 		} else {
 			return wfMsgHtml( 'filehist-nothumb' );
 		}
 	}
+
+	/**
+	 * @param $enable bool
+	 */
+	protected function preventClickjacking( $enable = true ) {
+		$this->preventClickjacking = $enable;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getPreventClickjacking() {
+		return $this->preventClickjacking;
+	}
 }
 
 class ImageHistoryPseudoPager extends ReverseChronologicalPager {
+	protected $preventClickjacking = false;
+
+	/**
+	 * @var File
+	 */
+	protected $mImg;
+
+	/**
+	 * @var Title
+	 */
+	protected $mTitle;
+
+	/**
+	 * @param ImagePage $imagePage
+	 */
 	function __construct( $imagePage ) {
 		parent::__construct();
 		$this->mImagePage = $imagePage;
-		$this->mTitle = clone( $imagePage->getTitle() );
+		$this->mTitle = clone ( $imagePage->getTitle() );
 		$this->mTitle->setFragment( '#filehistory' );
-		$this->mImg = NULL;
+		$this->mImg = null;
 		$this->mHist = array();
 		$this->mRange = array( 0, 0 ); // display range
 	}
-	
+
+	/**
+	 * @return Title
+	 */
 	function getTitle() {
 		return $this->mTitle;
 	}
@@ -1029,79 +1153,94 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager {
 		return false;
 	}
 
+	/**
+	 * @return string
+	 */
 	function getIndexField() {
 		return '';
 	}
 
+	/**
+	 * @return string
+	 */
 	function formatRow( $row ) {
 		return '';
 	}
-	
+
+	/**
+	 * @return string
+	 */
 	function getBody() {
 		$s = '';
 		$this->doQuery();
-		if( count($this->mHist) ) {
+		if ( count( $this->mHist ) ) {
 			$list = new ImageHistoryList( $this->mImagePage );
 			# Generate prev/next links
 			$navLink = $this->getNavigationBar();
-			$s = $list->beginImageHistoryList($navLink);
+			$s = $list->beginImageHistoryList( $navLink );
 			// Skip rows there just for paging links
-			for( $i = $this->mRange[0]; $i <= $this->mRange[1]; $i++ ) {
+			for ( $i = $this->mRange[0]; $i <= $this->mRange[1]; $i++ ) {
 				$file = $this->mHist[$i];
 				$s .= $list->imageHistoryLine( !$file->isOld(), $file );
 			}
-			$s .= $list->endImageHistoryList($navLink);
+			$s .= $list->endImageHistoryList( $navLink );
+
+			if ( $list->getPreventClickjacking() ) {
+				$this->preventClickjacking();
+			}
 		}
 		return $s;
 	}
 
 	function doQuery() {
-		if( $this->mQueryDone ) return;
+		if ( $this->mQueryDone ) {
+			return;
+		}
 		$this->mImg = $this->mImagePage->getFile(); // ensure loading
-		if( !$this->mImg->exists() ) {
+		if ( !$this->mImg->exists() ) {
 			return;
 		}
 		$queryLimit = $this->mLimit + 1; // limit plus extra row
-		if( $this->mIsBackwards ) {
+		if ( $this->mIsBackwards ) {
 			// Fetch the file history
-			$this->mHist = $this->mImg->getHistory($queryLimit,null,$this->mOffset,false);
+			$this->mHist = $this->mImg->getHistory( $queryLimit, null, $this->mOffset, false );
 			// The current rev may not meet the offset/limit
-			$numRows = count($this->mHist);
-			if( $numRows <= $this->mLimit && $this->mImg->getTimestamp() > $this->mOffset ) {
-				$this->mHist = array_merge( array($this->mImg), $this->mHist );
+			$numRows = count( $this->mHist );
+			if ( $numRows <= $this->mLimit && $this->mImg->getTimestamp() > $this->mOffset ) {
+				$this->mHist = array_merge( array( $this->mImg ), $this->mHist );
 			}
 		} else {
 			// The current rev may not meet the offset
-			if( !$this->mOffset || $this->mImg->getTimestamp() < $this->mOffset ) {
+			if ( !$this->mOffset || $this->mImg->getTimestamp() < $this->mOffset ) {
 				$this->mHist[] = $this->mImg;
 			}
 			// Old image versions (fetch extra row for nav links)
-			$oiLimit = count($this->mHist) ? $this->mLimit : $this->mLimit+1;
+			$oiLimit = count( $this->mHist ) ? $this->mLimit : $this->mLimit + 1;
 			// Fetch the file history
 			$this->mHist = array_merge( $this->mHist,
-				$this->mImg->getHistory($oiLimit,$this->mOffset,null,false) );
+				$this->mImg->getHistory( $oiLimit, $this->mOffset, null, false ) );
 		}
-		$numRows = count($this->mHist); // Total number of query results
-		if( $numRows ) {
+		$numRows = count( $this->mHist ); // Total number of query results
+		if ( $numRows ) {
 			# Index value of top item in the list
 			$firstIndex = $this->mIsBackwards ?
-				$this->mHist[$numRows-1]->getTimestamp() : $this->mHist[0]->getTimestamp();
+				$this->mHist[$numRows - 1]->getTimestamp() : $this->mHist[0]->getTimestamp();
 			# Discard the extra result row if there is one
-			if( $numRows > $this->mLimit && $numRows > 1 ) {
-				if( $this->mIsBackwards ) {
+			if ( $numRows > $this->mLimit && $numRows > 1 ) {
+				if ( $this->mIsBackwards ) {
 					# Index value of item past the index
 					$this->mPastTheEndIndex = $this->mHist[0]->getTimestamp();
 					# Index value of bottom item in the list
 					$lastIndex = $this->mHist[1]->getTimestamp();
 					# Display range
-					$this->mRange = array( 1, $numRows-1 );
+					$this->mRange = array( 1, $numRows - 1 );
 				} else {
 					# Index value of item past the index
-					$this->mPastTheEndIndex = $this->mHist[$numRows-1]->getTimestamp();
+					$this->mPastTheEndIndex = $this->mHist[$numRows - 1]->getTimestamp();
 					# Index value of bottom item in the list
-					$lastIndex = $this->mHist[$numRows-2]->getTimestamp();
+					$lastIndex = $this->mHist[$numRows - 2]->getTimestamp();
 					# Display range
-					$this->mRange = array( 0, $numRows-2 );
+					$this->mRange = array( 0, $numRows - 2 );
 				}
 			} else {
 				# Setting indexes to an empty string means that they will be
@@ -1111,16 +1250,16 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager {
 				$this->mPastTheEndIndex = '';
 				# Index value of bottom item in the list
 				$lastIndex = $this->mIsBackwards ?
-					$this->mHist[0]->getTimestamp() : $this->mHist[$numRows-1]->getTimestamp();
+					$this->mHist[0]->getTimestamp() : $this->mHist[$numRows - 1]->getTimestamp();
 				# Display range
-				$this->mRange = array( 0, $numRows-1 );
+				$this->mRange = array( 0, $numRows - 1 );
 			}
 		} else {
 			$firstIndex = '';
 			$lastIndex = '';
 			$this->mPastTheEndIndex = '';
 		}
-		if( $this->mIsBackwards ) {
+		if ( $this->mIsBackwards ) {
 			$this->mIsFirst = ( $numRows < $queryLimit );
 			$this->mIsLast = ( $this->mOffset == '' );
 			$this->mLastShown = $firstIndex;
@@ -1133,4 +1272,19 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager {
 		}
 		$this->mQueryDone = true;
 	}
+
+	/**
+	 * @param $enable bool
+	 */
+	protected function preventClickjacking( $enable = true ) {
+		$this->preventClickjacking = $enable;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getPreventClickjacking() {
+		return $this->preventClickjacking;
+	}
+
 }