From 9e084acc3783e26011f2563d5448ac5ccc102831 Mon Sep 17 00:00:00 2001 From: "This, that and the other" Date: Sun, 16 Feb 2014 21:30:25 +1100 Subject: [PATCH] Fix comment for $wgUseImageResize It is not obsolete - it is used by the Bitmap class. I tested it and it does indeed disable server-side image thumbnailing. The variable was originally un-obsoleted in r48787, but accidentally re-marked obsolete when merging upload-api/js2 branch in r53282. Also moving it to a more logical location in DefaultSettings. Change-Id: Ibb4d9784e997ea3b6ca7e2e0272635e6c8a30d26 --- includes/DefaultSettings.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index dd76a048d8..556bfd19bd 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -868,6 +868,13 @@ $wgContentHandlers = array( CONTENT_MODEL_TEXT => 'TextContentHandler', ); +/** + * Whether to enable server-side image thumbnailing. If false, images will + * always be sent to the client in full resolution, with appropriate width= and + * height= attributes on the tag for the client to do its own scaling. + */ +$wgUseImageResize = true; + /** * Resizing can be done using PHP's internal image libraries or using * ImageMagick or another third-party converter, e.g. GraphicMagick. @@ -1066,11 +1073,6 @@ $wgGenerateThumbnailOnParse = true; */ $wgShowArchiveThumbnails = true; -/** - * Obsolete, always true, kept for compatibility with extensions - */ -$wgUseImageResize = true; - /** * If set to true, images that contain certain the exif orientation tag will * be rotated accordingly. If set to null, try to auto-detect whether a scaler -- 2.20.1