* (bug 2800) Don't scale up small images on |thumb| without explicit size

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8351665..46afa73 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -97,6 +97,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 3408) Bulgarian formatNum corrected
 * (bug 3448) Set page_len on undelete
 * (bug 3405) Don't use raw letters as aliases of MSGNW: and SUBST:
+* (bug 2800) Don't scale up small images on |thumb| without explicit size
 
 
 === Caveats ===

diff --git a/includes/Linker.php b/includes/Linker.php
index 54daa1a..044e2a8 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -415,7 +415,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;