Tweak r47992 to use instead of a new configuration variable. Also moved its preceden...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 16ddd4e..65743b4 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -25,8 +25,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Added $wgUseTwoButtonsSearchForm to choose the Search form behavior/look
 * Added $wgNoFollowDomainExceptions to allow exempting particular domain names
   from rel="nofollow" on external links
-* (bug 12970) Added $wgForceClientThumbnails to force client rendering of thumbs,
-  instead of falling back to GD.
+* (bug 12970) Brought back $wgUseImageResize.
 * Added $wgRedirectOnLogin to allow specifying a specifc page to redirect users
   to upon logging in (ex: "Main Page")
 * Add $wgExportFromNamespaces for enabling/disabling the "export all from 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b4f5739..57a67de 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2115,7 +2115,7 @@ $wgIgnoreImageErrors = false;
  */
 $wgGenerateThumbnailOnParse = true;
 
-/** Obsolete, always true, kept for compatibility with extensions */
+/** Whether or not to use image resizing */
 $wgUseImageResize = true;
 
 /** 
@@ -3797,4 +3797,4 @@ $wgInvalidUsernameCharacters = '@';
  * $wgInvalidUsernameCharacters above, or you will not be able to
  * modify the user rights of those users via Special:UserRights
  */
-$wgUserrightsInterwikiDelimiter = '@';
\ No newline at end of file
+$wgUserrightsInterwikiDelimiter = '@';

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 427c780..c2f2458 100644 (file)
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -42,7 +42,7 @@ class BitmapHandler extends ImageHandler {
 
        function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
                global $wgUseImageMagick, $wgImageMagickConvertCommand, $wgImageMagickTempDir;
-               global $wgCustomConvertCommand, $wgForceClientThumbnails;
+               global $wgCustomConvertCommand, $wgUseImageResize;
                global $wgSharpenParameter, $wgSharpenReductionThreshold;
                global $wgMaxAnimatedGifArea;
 
@@ -69,12 +69,12 @@ class BitmapHandler extends ImageHandler {
                if ( !$dstPath ) {
                        // No output path available, client side scaling only
                        $scaler = 'client';
+               } elseif( !$wgUseImageResize ) {
+                       $scaler = 'client';
                } elseif ( $wgUseImageMagick ) {
                        $scaler = 'im';
                } elseif ( $wgCustomConvertCommand ) {
                        $scaler = 'custom';
-               } elseif( $wgForceClientThumbnails ) {
-                       $scaler = 'client';
                } elseif ( function_exists( 'imagecreatetruecolor' ) ) {
                        $scaler = 'gd';
                } else {