* 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
*/
$wgGenerateThumbnailOnParse = true;
-/** Obsolete, always true, kept for compatibility with extensions */
+/** Whether or not to use image resizing */
$wgUseImageResize = true;
/**
* $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 = '@';
function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
global $wgUseImageMagick, $wgImageMagickConvertCommand, $wgImageMagickTempDir;
- global $wgCustomConvertCommand, $wgForceClientThumbnails;
+ global $wgCustomConvertCommand, $wgUseImageResize;
global $wgSharpenParameter, $wgSharpenReductionThreshold;
global $wgMaxAnimatedGifArea;
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 {