Revert unrelated changes from r99916

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 86e70a1..9a017da 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -287,9 +287,6 @@ class ImagePage extends Article {
                        $width = $width_orig;
                        $height_orig = $this->displayImg->getHeight( $page );
                        $height = $height_orig;
-                       $mustRender = $this->displayImg->getHandler() &&
-                               $this->displayImg->getHandler()->mustRender( $this->displayImg );
-                       $addFullResolutionLink = false;
 
                        $longDesc = wfMsg( 'parentheses', $this->displayImg->getLongDesc() );
 
@@ -315,19 +312,14 @@ class ImagePage extends Article {
                                                # Note that $height <= $maxHeight now, but might not be identical
                                                # because of rounding.
                                        }
-
+                                       $msgbig  = wfMsgHtml( 'show-big-image' );
                                        $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] );
-                                               } 
+                                               }
                                        }
-                                       if ( $mustRender ) {
-                                               $otherSizes[] = $this->makeSizeLink( $params, $width_orig, $height_orig, 'show-big-image' );
-                                       } else {
-                                               $addFullResolutionLink = true; 
-                                       } 
                                        $msgsmall = wfMessage( 'show-big-image-preview' )->
                                                rawParams( $this->makeSizeLink( $params, $width, $height ) )->
                                                parse() . ' ' .
@@ -355,7 +347,7 @@ class ImagePage extends Article {
                                if ( $thumbnail ) {
                                        $options = array(
                                                'alt' => $this->displayImg->getTitle()->getPrefixedText(),
-                                               'file-link' => !$mustRender,
+                                               'file-link' => true,
                                        );
                                        $wgOut->addHTML( '<div class="fullImageLink" id="file">' .
                                                $thumbnail->toHtml( $options ) .
@@ -436,8 +428,8 @@ class ImagePage extends Article {
                        if ( $showLink ) {
                                $filename = wfEscapeWikiText( $this->displayImg->getName() );
                                $linktext = $filename;
-                               if ( $addFullResolutionLink ) {
-                                       $linktext = wfMsg( 'show-big-image' );
+                               if ( isset( $msgbig ) ) {
+                                       $linktext = wfEscapeWikiText( $msgbig );
                                }
                                $medialink = "[[Media:$filename|$linktext]]";
 
@@ -492,7 +484,7 @@ EOT
         * @param int $width
         * @param int $height
         */
-       private function makeSizeLink( $params, $width, $height, $msg = 'show-big-image-size' ) {
+       private function makeSizeLink( $params, $width, $height ) {
                $params['width'] = $width;
                $params['height'] = $height;
                $thumbnail = $this->displayImg->transform( $params );
@@ -500,7 +492,7 @@ EOT
                        return Html::rawElement( 'a', array(
                                'href' => $thumbnail->getUrl(),
                                'class' => 'mw-thumbnail-link'
-                               ), wfMessage( $msg )->numParams(
+                               ), wfMessage( 'show-big-image-size' )->numParams(
                                        $thumbnail->getWidth(), $thumbnail->getHeight()
                                )->parse() );
                } else {