Followup r100905, cleanup per CR and fixes the overriding of the main RequestContext

[lhc/web/wiklou.git] / includes / ImagePage.php

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index f461fa7..7950aaf 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -18,6 +18,10 @@ class ImagePage extends Article {
 
        var $mExtraDescription = false;
 
+       /**
+        * @param $title Title
+        * @return WikiFilePage
+        */
        protected function newPage( Title $title ) {
                // Overload mPage with a file-specific page
                return new WikiFilePage( $title );
@@ -323,11 +327,13 @@ class ImagePage extends Article {
                                        $msgsmall = wfMessage( 'show-big-image-preview' )->
                                                rawParams( $this->makeSizeLink( $params, $width, $height ) )->
                                                parse() . ' ' .
-                                               wfMessage( 'show-big-image-other' )->
-                                               rawParams( $wgLang->pipeList( $otherSizes ) )->parse();
+                                               Html::rawElement( 'span', array( 'class' => 'mw-filepage-other-resolutions' ),
+                                                       wfMessage( 'show-big-image-other' )->
+                                                       rawParams( $wgLang->pipeList( $otherSizes ), count( $otherSizes ) )->parse()
+                                               );
                                } else {
                                        # Image is small enough to show full size on image page
-                                       $msgsmall = wfMsgExt( 'file-nohires', array( 'parseinline' ) );
+                                       $msgsmall = wfMessage( 'file-nohires' )->parse();
                                }
 
                                $params['width'] = $width;
@@ -335,7 +341,7 @@ class ImagePage extends Article {
                                $thumbnail = $this->displayImg->transform( $params );
 
                                $showLink = true;
-                               $anchorclose = '<br />' . $msgsmall;
+                               $anchorclose = Html::rawElement( 'div', array( 'class' => 'mw-filepage-resolutioninfo' ), $msgsmall );
 
                                $isMulti = $this->displayImg->isMultipage() && $this->displayImg->pageCount() > 1;
                                if ( $isMulti ) {