1 files changed, 58 insertions, 42 deletions

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index d06c8191..8f635cfa 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -76,7 +76,7 @@ class ImagePage extends Article {
 		$this->fileLoaded = true;
 
 		$this->displayImg = $img = false;
-		wfRunHooks( 'ImagePageFindFile', array( $this, &$img, &$this->displayImg ) );
+		Hooks::run( 'ImagePageFindFile', array( $this, &$img, &$this->displayImg ) );
 		if ( !$img ) { // not set by hook?
 			$img = wfFindFile( $this->getTitle() );
 			if ( !$img ) {
@@ -140,7 +140,7 @@ class ImagePage extends Article {
 
 		if ( $wgShowEXIF && $this->displayImg->exists() ) {
 			// @todo FIXME: Bad interface, see note on MediaHandler::formatMetadata().
-			$formattedMetadata = $this->displayImg->formatMetadata();
+			$formattedMetadata = $this->displayImg->formatMetadata( $this->getContext() );
 			$showmeta = $formattedMetadata !== false;
 		} else {
 			$showmeta = false;
@@ -175,7 +175,7 @@ class ImagePage extends Article {
 
 		# Show shared description, if needed
 		if ( $this->mExtraDescription ) {
-			$fol = wfMessage( 'shareddescriptionfollows' );
+			$fol = $this->getContext()->msg( 'shareddescriptionfollows' );
 			if ( !$fol->isDisabled() ) {
 				$out->addWikiText( $fol->plain() );
 			}
@@ -188,7 +188,7 @@ class ImagePage extends Article {
 
 		$out->addHTML( Xml::element( 'h2',
 			array( 'id' => 'filelinks' ),
-			wfMessage( 'imagelinks' )->text() ) . "\n" );
+				$this->getContext()->msg( 'imagelinks' )->text() ) . "\n" );
 		$this->imageDupes();
 		# @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
@@ -196,7 +196,7 @@ class ImagePage extends Article {
 
 		# Allow extensions to add something after the image links
 		$html = '';
-		wfRunHooks( 'ImagePageAfterImageLinks', array( $this, &$html ) );
+		Hooks::run( 'ImagePageAfterImageLinks', array( $this, &$html ) );
 		if ( $html ) {
 			$out->addHTML( $html );
 		}
@@ -205,7 +205,7 @@ class ImagePage extends Article {
 			$out->addHTML( Xml::element(
 				'h2',
 				array( 'id' => 'metadata' ),
-				wfMessage( 'metadata' )->text() ) . "\n" );
+					$this->getContext()->msg( 'metadata' )->text() ) . "\n" );
 			$out->addWikiText( $this->makeMetadataTable( $formattedMetadata ) );
 			$out->addModules( array( 'mediawiki.action.view.metadata' ) );
 		}
@@ -237,16 +237,17 @@ class ImagePage extends Article {
 	 */
 	protected function showTOC( $metadata ) {
 		$r = array(
-			'<li><a href="#file">' . wfMessage( 'file-anchor-link' )->escaped() . '</a></li>',
-			'<li><a href="#filehistory">' . wfMessage( 'filehist' )->escaped() . '</a></li>',
-			'<li><a href="#filelinks">' . wfMessage( 'imagelinks' )->escaped() . '</a></li>',
+			'<li><a href="#file">' . $this->getContext()->msg( 'file-anchor-link' )->escaped() . '</a></li>',
+			'<li><a href="#filehistory">' . $this->getContext()->msg( 'filehist' )->escaped() . '</a></li>',
+			'<li><a href="#filelinks">' . $this->getContext()->msg( 'imagelinks' )->escaped() . '</a></li>',
 		);
+
+		Hooks::run( 'ImagePageShowTOC', array( $this, &$r ) );
+
 		if ( $metadata ) {
-			$r[] = '<li><a href="#metadata">' . wfMessage( 'metadata' )->escaped() . '</a></li>';
+			$r[] = '<li><a href="#metadata">' . $this->getContext()->msg( 'metadata' )->escaped() . '</a></li>';
 		}
 
-		wfRunHooks( 'ImagePageShowTOC', array( $this, &$r ) );
-
 		return '<ul id="filetoc">' . implode( "\n", $r ) . '</ul>';
 	}
 
@@ -260,7 +261,7 @@ class ImagePage extends Article {
 	 */
 	protected function makeMetadataTable( $metadata ) {
 		$r = "<div class=\"mw-imagepage-section-metadata\">";
-		$r .= wfMessage( 'metadata-help' )->plain();
+		$r .= $this->getContext()->msg( 'metadata-help' )->plain();
 		$r .= "<table id=\"mw_metadata\" class=\"mw_metadata\">\n";
 		foreach ( $metadata as $type => $stuff ) {
 			foreach ( $stuff as $v ) {
@@ -336,19 +337,19 @@ class ImagePage extends Article {
 			$filename = wfEscapeWikiText( $this->displayImg->getName() );
 			$linktext = $filename;
 
-			wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this, &$out ) );
+			Hooks::run( 'ImageOpenShowImageInlineBefore', array( &$this, &$out ) );
 
 			if ( $this->displayImg->allowInlineDisplay() ) {
 				# image
 				# "Download high res version" link below the image
-				# $msgsize = wfMessage( 'file-info-size', $width_orig, $height_orig,
+				# $msgsize = $this->getContext()->msg( 'file-info-size', $width_orig, $height_orig,
 				#   Linker::formatSize( $this->displayImg->getSize() ), $mime )->escaped();
 				# We'll show a thumbnail of this image
 				if ( $width > $maxWidth || $height > $maxHeight || $this->displayImg->isVectorized() ) {
 					list( $width, $height ) = $this->getDisplayWidthHeight(
 						$maxWidth, $maxHeight, $width, $height
 					);
-					$linktext = wfMessage( 'show-big-image' )->escaped();
+					$linktext = $this->getContext()->msg( 'show-big-image' )->escaped();
 
 					$thumbSizes = $this->getThumbSizes( $width, $height, $width_orig, $height_orig );
 					# Generate thumbnails or thumbnail links as needed...
@@ -377,14 +378,14 @@ class ImagePage extends Article {
 					$msgsmall = '';
 					$sizeLinkBigImagePreview = $this->makeSizeLink( $params, $width, $height );
 					if ( $sizeLinkBigImagePreview ) {
-						$msgsmall .= wfMessage( 'show-big-image-preview' )->
+						$msgsmall .= $this->getContext()->msg( 'show-big-image-preview' )->
 							rawParams( $sizeLinkBigImagePreview )->
 							parse();
 					}
 					if ( count( $otherSizes ) ) {
 						$msgsmall .= ' ' .
 						Html::rawElement( 'span', array( 'class' => 'mw-filepage-other-resolutions' ),
-							wfMessage( 'show-big-image-other' )->rawParams( $lang->pipeList( $otherSizes ) )->
+							$this->getContext()->msg( 'show-big-image-other' )->rawParams( $lang->pipeList( $otherSizes ) )->
 							params( count( $otherSizes ) )->parse()
 						);
 					}
@@ -394,7 +395,7 @@ class ImagePage extends Article {
 					$msgsmall = '';
 				} else {
 					# Image is small enough to show full size on image page
-					$msgsmall = wfMessage( 'file-nohires' )->parse();
+					$msgsmall = $this->getContext()->msg( 'file-nohires' )->parse();
 				}
 
 				$params['width'] = $width;
@@ -428,7 +429,7 @@ class ImagePage extends Article {
 					$count = $this->displayImg->pageCount();
 
 					if ( $page > 1 ) {
-						$label = $out->parse( wfMessage( 'imgmultipageprev' )->text(), false );
+						$label = $out->parse( $this->getContext()->msg( 'imgmultipageprev' )->text(), false );
 						// on the client side, this link is generated in ajaxifyPageNavigation()
 						// in the mediawiki.page.image.pagination module
 						$link = Linker::linkKnown(
@@ -450,7 +451,7 @@ class ImagePage extends Article {
 					}
 
 					if ( $page < $count ) {
-						$label = wfMessage( 'imgmultipagenext' )->text();
+						$label = $this->getContext()->msg( 'imgmultipagenext' )->text();
 						$link = Linker::linkKnown(
 							$this->getTitle(),
 							$label,
@@ -487,8 +488,8 @@ class ImagePage extends Article {
 						'</td><td><div class="multipageimagenavbox">' .
 						Xml::openElement( 'form', $formParams ) .
 						Html::hidden( 'title', $this->getTitle()->getPrefixedDBkey() ) .
-							wfMessage( 'imgmultigoto' )->rawParams( $select )->parse() .
-						Xml::submitButton( wfMessage( 'imgmultigo' )->text() ) .
+						$this->getContext()->msg( 'imgmultigoto' )->rawParams( $select )->parse() .
+						Xml::submitButton( $this->getContext()->msg( 'imgmultigo' )->text() ) .
 						Xml::closeElement( 'form' ) .
 						"<hr />$thumb1\n$thumb2<br style=\"clear: both\" /></div></td></tr></table>"
 					);
@@ -502,12 +503,28 @@ class ImagePage extends Article {
 					"</div>\n" );
 			}
 
-			$longDesc = wfMessage( 'parentheses', $this->displayImg->getLongDesc() )->text();
+			$longDesc = $this->getContext()->msg( 'parentheses', $this->displayImg->getLongDesc() )->text();
+
+			$handler = $this->displayImg->getHandler();
+
+			// If this is a filetype with potential issues, warn the user.
+			if ( $handler ) {
+				$warningConfig = $handler->getWarningConfig( $this->displayImg );
+
+				if ( $warningConfig !== null ) {
+					// The warning will be displayed via CSS and JavaScript.
+					// We just need to tell the client side what message to use.
+					$output = $this->getContext()->getOutput();
+					$output->addJsConfigVars( 'wgFileWarning', $warningConfig );
+					$output->addModules( $warningConfig['module'] );
+					$output->addModules( 'mediawiki.filewarning' );
+				}
+			}
 
 			$medialink = "[[Media:$filename|$linktext]]";
 
 			if ( !$this->displayImg->isSafeFile() ) {
-				$warning = wfMessage( 'mediawarning' )->plain();
+				$warning = $this->getContext()->msg( 'mediawarning' )->plain();
 				// dirmark is needed here to separate the file name, which
 				// most likely ends in Latin characters, from the description,
 				// which may begin with the file type. In RTL environment
@@ -619,7 +636,7 @@ EOT
 			return Html::rawElement( 'a', array(
 				'href' => $thumbnail->getUrl(),
 				'class' => 'mw-thumbnail-link'
-				), wfMessage( 'show-big-image-size' )->numParams(
+				), $this->getContext()->msg( 'show-big-image-size' )->numParams(
 					$thumbnail->getWidth(), $thumbnail->getHeight()
 				)->parse() );
 		} else {
@@ -645,9 +662,9 @@ EOT
 		$wrap = "<div class=\"sharedUploadNotice\">\n$1\n</div>\n";
 		$repo = $this->mPage->getFile()->getRepo()->getDisplayName();
 
-		if ( $descUrl && $descText && wfMessage( 'sharedupload-desc-here' )->plain() !== '-' ) {
+		if ( $descUrl && $descText && $this->getContext()->msg( 'sharedupload-desc-here' )->plain() !== '-' ) {
 			$out->wrapWikiMsg( $wrap, array( 'sharedupload-desc-here', $repo, $descUrl ) );
-		} elseif ( $descUrl && wfMessage( 'sharedupload-desc-there' )->plain() !== '-' ) {
+		} elseif ( $descUrl && $this->getContext()->msg( 'sharedupload-desc-there' )->plain() !== '-' ) {
 			$out->wrapWikiMsg( $wrap, array( 'sharedupload-desc-there', $repo, $descUrl ) );
 		} else {
 			$out->wrapWikiMsg( $wrap, array( 'sharedupload', $repo ), ''/*BACKCOMPAT*/ );
@@ -694,7 +711,7 @@ EOT
 		) {
 			$ulink = Linker::makeExternalLink(
 				$this->getUploadUrl(),
-				wfMessage( 'uploadnewversion-linktext' )->text()
+				$this->getContext()->msg( 'uploadnewversion-linktext' )->text()
 			);
 			$out->addHTML( "<li id=\"mw-imagepage-reupload-link\">"
 				. "<div class=\"plainlinks\">{$ulink}</div></li>\n" );
@@ -832,7 +849,7 @@ EOT
 				$liContents = $link;
 			} elseif ( count( $redirects[$element->page_title] ) === 0 ) {
 				# Redirect without usages
-				$liContents = wfMessage( 'linkstoimage-redirect' )->rawParams( $link, '' )->parse();
+				$liContents = $this->getContext()->msg( 'linkstoimage-redirect' )->rawParams( $link, '' )->parse();
 			} else {
 				# Redirect with usages
 				$li = '';
@@ -855,7 +872,7 @@ EOT
 					array( 'class' => 'mw-imagepage-redirectstofile' ),
 					$li
 					) . "\n";
-				$liContents = wfMessage( 'linkstoimage-redirect' )->rawParams(
+				$liContents = $this->getContext()->msg( 'linkstoimage-redirect' )->rawParams(
 					$link, $ul )->parse();
 			}
 			$out->addHTML( Html::rawElement(
@@ -901,7 +918,7 @@ EOT
 			} else {
 				$link = Linker::makeExternalLink( $file->getDescriptionUrl(),
 					$file->getTitle()->getPrefixedText() );
-				$fromSrc = wfMessage( 'shared-repo-from', $file->getRepo()->getDisplayName() )->text();
+				$fromSrc = $this->getContext()->msg( 'shared-repo-from', $file->getRepo()->getDisplayName() )->text();
 			}
 			$out->addHTML( "<li>{$link} {$fromSrc}</li>\n" );
 		}
@@ -930,7 +947,7 @@ EOT
 	 */
 	function showError( $description ) {
 		$out = $this->getContext()->getOutput();
-		$out->setPageTitle( wfMessage( 'internalerror' ) );
+		$out->setPageTitle( $this->getContext()->msg( 'internalerror' ) );
 		$out->setRobotPolicy( 'noindex,nofollow' );
 		$out->setArticleRelated( false );
 		$out->enableClientCache( false );
@@ -1008,7 +1025,7 @@ EOT
 			$code = wfBCP47( $lang );
 			$name = Language::fetchLanguageName( $code, $this->getContext()->getLanguage()->getCode() );
 			if ( $name !== '' ) {
-				$display = wfMessage( 'img-lang-opt', $code, $name )->text();
+				$display = $this->getContext()->msg( 'img-lang-opt', $code, $name )->text();
 			} else {
 				$display = $code;
 			}
@@ -1024,7 +1041,7 @@ EOT
 			// Its hard to know if the content is really in the default language, or
 			// if its just unmarked content that could be in any language.
 			$opts = Xml::option(
-				wfMessage( 'img-lang-default' )->text(),
+					$this->getContext()->msg( 'img-lang-default' )->text(),
 				$defaultLang,
 				$defaultLang === $curLang
 			) . $opts;
@@ -1032,7 +1049,7 @@ EOT
 		if ( !$haveCurrentLang && $defaultLang !== $curLang ) {
 			$name = Language::fetchLanguageName( $curLang, $this->getContext()->getLanguage()->getCode() );
 			if ( $name !== '' ) {
-				$display = wfMessage( 'img-lang-opt', $curLang, $name )->text();
+				$display = $this->getContext()->msg( 'img-lang-opt', $curLang, $name )->text();
 			} else {
 				$display = $curLang;
 			}
@@ -1044,9 +1061,9 @@ EOT
 			array( 'id' => 'mw-imglangselector', 'name' => 'lang' ),
 			$opts
 		);
-		$submit = Xml::submitButton( wfMessage( 'img-lang-go' )->text() );
+		$submit = Xml::submitButton( $this->getContext()->msg( 'img-lang-go' )->text() );
 
-		$formContents = wfMessage( 'img-lang-info' )->rawParams( $select, $submit )->parse()
+		$formContents = $this->getContext()->msg( 'img-lang-info' )->rawParams( $select, $submit )->parse()
 			. Html::hidden( 'title', $this->getTitle()->getPrefixedDBkey() );
 
 		$langSelectLine = Html::rawElement( 'div', array( 'id' => 'mw-imglangselector-line' ),
@@ -1199,9 +1216,9 @@ class ImageHistoryList extends ContextSource {
 			. $this->msg( 'filehist-help' )->parseAsBlock()
 			. $navLinks . "\n"
 			. Xml::openElement( 'table', array( 'class' => 'wikitable filehistory' ) ) . "\n"
-			. '<tr><td></td>'
+			. '<tr><th></th>'
 			. ( $this->current->isLocal()
-				&& ( $this->getUser()->isAllowedAny( 'delete', 'deletedhistory' ) ) ? '<td></td>' : '' )
+				&& ( $this->getUser()->isAllowedAny( 'delete', 'deletedhistory' ) ) ? '<th></th>' : '' )
 			. '<th>' . $this->msg( 'filehist-datetime' )->escaped() . '</th>'
 			. ( $this->showThumb ? '<th>' . $this->msg( 'filehist-thumb' )->escaped() . '</th>' : '' )
 			. '<th>' . $this->msg( 'filehist-dimensions' )->escaped() . '</th>'
@@ -1364,7 +1381,6 @@ class ImageHistoryList extends ContextSource {
 		} else {
 			if ( $local ) {
 				$row .= Linker::userLink( $userId, $userText );
-				$row .= $this->msg( 'word-separator' )->escaped();
 				$row .= '<span style="white-space: nowrap;">';
 				$row .= Linker::userToolLinks( $userId, $userText );
 				$row .= '</span>';
@@ -1384,7 +1400,7 @@ class ImageHistoryList extends ContextSource {
 		}
 
 		$rowClass = null;
-		wfRunHooks( 'ImagePageFileHistoryLine', array( $this, $file, &$row, &$rowClass ) );
+		Hooks::run( 'ImagePageFileHistoryLine', array( $this, $file, &$row, &$rowClass ) );
 		$classAttr = $rowClass ? " class='$rowClass'" : '';
 
 		return "<tr{$classAttr}>{$row}</tr>\n";