* (bug 3806) Gracefully fall back to client-side scaling on |thumb| image

  that passes $wgMaxImageArea

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3617ead..9ce790b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -178,6 +178,8 @@ fully support the editing toolbar, but was found to be too confusing.
 * Fix Special:BrokenRedirects on MySQL 5.0
 * (bug 3807) Fix 'all' in namespaces drop-down on contribs, rc
 * Fail gracefully on invalid namespace in Special:Newpages
+* (bug 3806) Gracefully fall back to client-side scaling on |thumb| image
+  that passes $wgMaxImageArea
 
 
 === Caveats ===

diff --git a/includes/Linker.php b/includes/Linker.php
index 8da9612..52e136f 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -531,7 +531,11 @@ class Linker {
                $textalign = $wgContLang->isRTL() ? ' style="text-align:right"' : '';
 
                $s = "<div class=\"thumb t{$align}\"><div style=\"width:{$oboxwidth}px;\">";
-               if ( $thumbUrl == '' ) {
+               if( $thumbUrl == '' ) {
+                       // Couldn't generate thumbnail? Scale the image client-side.
+                       $thumbUrl = $url;
+               }
+               if( !$img->exists() ) {
                        $s .= $this->makeBrokenImageLinkObj( $img->getTitle() );
                        $zoomicon = '';
                } else {