aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Manske <magnusmanske@users.mediawiki.org>2004-07-10 20:00:41 +0000
committerMagnus Manske <magnusmanske@users.mediawiki.org>2004-07-10 20:00:41 +0000
commit62ffcc2ee4a165a2f636f5279f67cfb1334406f9 (patch)
tree71a616c56c687b8bae3907689beeb338d619b1da
parentb1e7ca8aac54b0918a5df751485b87b07e7ced6d (diff)
downloadmediawikicore-62ffcc2ee4a165a2f636f5279f67cfb1334406f9.tar.gz
mediawikicore-62ffcc2ee4a165a2f636f5279f67cfb1334406f9.zip
manual thumbnail option fix
Notes
Notes: http://mediawiki.org/wiki/Special:Code/MediaWiki/4265
-rw-r--r--includes/Skin.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/Skin.php b/includes/Skin.php
index 2df5c7c2f666..ab40ff88e045 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1828,7 +1828,7 @@ class Skin {
print 'rescaling by factor '. $height / $img->getHeight() . "<br>\n";
$width = $img->getWidth() * $height / $img->getHeight();
}
- $url = $img->createThumb( $width );
+ if ( '' == $manual_thumb ) $url = $img->createThumb( $width );
}
} # endif $wgUseImageResize
@@ -1885,7 +1885,7 @@ class Skin {
} else {
$boxheight = $h;
}
- $thumbUrl = $img->createThumb( $boxwidth );
+ if ( '' == $manual_thumb ) $thumbUrl = $img->createThumb( $boxwidth );
}
if ( $manual_thumb != '' ) # Use manually specified thumbnail