Remove debugging code

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

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index e99e046..7bdfe8c 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -46,19 +46,18 @@ class ImagePage extends Article {
                $full_url  = $this->img->getViewURL();
                $anchoropen = '';
                $anchorclose = '';
-               if ( $wgUseImageResize ) {
-                       if( $wgUser->getOption( 'imagesize' ) == '' ) {
-                               $sizeSel = User::getDefaultOption( 'imagesize' );
-                       } else {
-                               $sizeSel = IntVal( $wgUser->getOption( 'imagesize' ) );
-                       }
-                       if( !isset( $wgImageLimits[$sizeSel] ) ) {
-                               $sizeSel = User::getDefaultOption( 'imagesize' );
-                       }
-                       $max = $wgImageLimits[$sizeSel];
-                       $maxWidth = $max[0];
-                       $maxHeight = $max[1];
+
+               if( $wgUser->getOption( 'imagesize' ) == '' ) {
+                       $sizeSel = User::getDefaultOption( 'imagesize' );
+               } else {
+                       $sizeSel = IntVal( $wgUser->getOption( 'imagesize' ) );
+               }
+               if( !isset( $wgImageLimits[$sizeSel] ) ) {
+                       $sizeSel = User::getDefaultOption( 'imagesize' );
                }
+               $max = $wgImageLimits[$sizeSel];
+               $maxWidth = $max[0];
+               $maxHeight = $max[1];
 
 
                if ( $this->img->exists() ) {
@@ -70,18 +69,35 @@ class ImagePage extends Article {
                                $width = $this->img->getWidth();
                                $height = $this->img->getHeight();
                                $msg = wfMsg('showbigimage', $width, $height, intval( $this->img->getSize()/1024 ) );
-                               if ( $width > $maxWidth && $wgUseImageResize ) {
+                               if ( $width > $maxWidth ) {
                                        $height = floor( $height * $maxWidth / $width );
                                        $width  = $maxWidth;
                                } 
-                               if ( $height > $maxHeight && $wgUseImageResize ) {
+                               if ( $height > $maxHeight ) {
                                        $width = floor( $width * $maxHeight / $height );
                                        $height = $maxHeight;
                                }
                                if ( $width != $this->img->getWidth() || $height != $this->img->getHeight() ) {
-                                       $url = $this->img->createThumb( $width );
+                                       if( $wgUseImageResize ) {
+                                               $thumbnail = $this->img->getThumbnail( $width );
+
+                                               if (    ( ! $this->img->mustRender() )
+                                                    && ( $thumbnail->getSize() > $this->img->getSize() ) ) {
+                                                       # the thumbnail is bigger thatn the original image.
+                                                       # show the original image instead of the thumb.
+                                                       $url = $full_url;
+                                                       $width = $this->img->getWidth();
+                                                       $height = $this->img->getHeight();
+                                               } else {
+                                                       $url = $thumbnail->getUrl();
+                                               }
+                                       } else {
+                                               # No resize ability? Show the full image, but scale
+                                               # it down in the browser so it fits on the page.
+                                               $url = $full_url;
+                                       }
                                        $anchoropen  = "<a href=\"{$full_url}\">";
-                                       $anchorclose = "<br>{$msg}</a>";
+                                       $anchorclose = "<br />{$msg}</a>";
                                } else {
                                        $url = $full_url;
                                }