diff options
| author | Brion Vibber <brion@users.mediawiki.org> | 2005-09-12 22:48:17 +0000 |
|---|---|---|
| committer | Brion Vibber <brion@users.mediawiki.org> | 2005-09-12 22:48:17 +0000 |
| commit | ec50b42fa35e8c3c4bc0c8aea313742559d173bf (patch) | |
| tree | 5e8f94d3385b5b37c5a325ccf3e0c11d92875db0 | |
| parent | f98b421d2df8c43ee6e567904a727970dc909da1 (diff) | |
| download | mediawikicore-ec50b42fa35e8c3c4bc0c8aea313742559d173bf.tar.gz mediawikicore-ec50b42fa35e8c3c4bc0c8aea313742559d173bf.zip | |
Copy bug 2800 fix from head
Notes
Notes:
http://mediawiki.org/wiki/Special:Code/MediaWiki/10993
| -rw-r--r-- | RELEASE-NOTES | 1 | ||||
| -rw-r--r-- | includes/Linker.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 69f2add5a0c6..bb5958b44d10 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -756,6 +756,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new. * Cap arbitrary SVG renders to given image size or $wgSVGMaxSize pixels wide * (bug 3127) Render large SVGs at image page size correctly * (bug 3448) Set page_len on undelete +* (bug 2800) Don't scale up small iamges on |thumb| without explicit size === Caveats === diff --git a/includes/Linker.php b/includes/Linker.php index bf25abd7fbbf..40e1390ea287 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -406,7 +406,7 @@ class Linker { $wopt = User::getDefaultOption( 'thumbsize' ); } - $width = $wgThumbLimits[$wopt]; + $width = min( $img->getWidth(), $wgThumbLimits[$wopt] ); } return $prefix.$this->makeThumbLinkObj( $img, $label, $alt, $align, $width, $height, $framed, $manual_thumb ).$postfix; |