Update to MediaWiki 1.24.1

1 files changed, 88 insertions, 6 deletions

diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index fa763668..fbdbdfe3 100644
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -32,6 +32,70 @@
  */
 class JpegHandler extends ExifBitmapHandler {
 
+	function normaliseParams( $image, &$params ) {
+		if ( !parent::normaliseParams( $image, $params ) ) {
+			return false;
+		}
+		if ( isset( $params['quality'] ) && !self::validateQuality( $params['quality'] ) ) {
+			return false;
+		}
+		return true;
+	}
+
+	function validateParam( $name, $value ) {
+		if ( $name === 'quality' ) {
+			return self::validateQuality( $value );
+		} else {
+			return parent::validateParam( $name, $value );
+		}
+	}
+
+	/** Validate and normalize quality value to be between 1 and 100 (inclusive).
+	 * @param int $value Quality value, will be converted to integer or 0 if invalid
+	 * @return bool True if the value is valid
+	 */
+	private static function validateQuality( $value ) {
+		return $value === 'low';
+	}
+
+	function makeParamString( $params ) {
+		// Prepend quality as "qValue-". This has to match parseParamString() below
+		$res = parent::makeParamString( $params );
+		if ( $res && isset( $params['quality'] ) ) {
+			$res = "q{$params['quality']}-$res";
+		}
+		return $res;
+	}
+
+	function parseParamString( $str ) {
+		// $str contains "qlow-200px" or "200px" strings because thumb.php would strip the filename
+		// first - check if the string begins with "qlow-", and if so, treat it as quality.
+		// Pass the first portion, or the whole string if "qlow-" not found, to the parent
+		// The parsing must match the makeParamString() above
+		$res = false;
+		$m = false;
+		if ( preg_match( '/q([^-]+)-(.*)$/', $str, $m ) ) {
+			$v = $m[1];
+			if ( self::validateQuality( $v ) ) {
+				$res = parent::parseParamString( $m[2] );
+				if ( $res ) {
+					$res['quality'] = $v;
+				}
+			}
+		} else {
+			$res = parent::parseParamString( $str );
+		}
+		return $res;
+	}
+
+	function getScriptParams( $params ) {
+		$res = parent::getScriptParams( $params );
+		if ( isset( $params['quality'] ) ) {
+			$res['quality'] = $params['quality'];
+		}
+		return $res;
+	}
+
 	function getMetadata( $image, $filename ) {
 		try {
 			$meta = BitmapMetadataHandler::Jpeg( $filename );
@@ -40,10 +104,11 @@ class JpegHandler extends ExifBitmapHandler {
 				throw new MWException( 'Metadata array is not an array' );
 			}
 			$meta['MEDIAWIKI_EXIF_VERSION'] = Exif::version();
+
 			return serialize( $meta );
-		}
-		catch ( MWException $e ) {
-			// BitmapMetadataHandler throws an exception in certain exceptional cases like if file does not exist.
+		} catch ( MWException $e ) {
+			// BitmapMetadataHandler throws an exception in certain exceptional
+			// cases like if file does not exist.
 			wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" );
 
 			/* This used to use 0 (ExifBitmapHandler::OLD_BROKEN_FILE) for the cases
@@ -55,14 +120,15 @@ class JpegHandler extends ExifBitmapHandler {
 			 * Thus switch to using -1 to denote only a broken file, and use an array with only
 			 * MEDIAWIKI_EXIF_VERSION to denote no props.
 			 */
+
 			return ExifBitmapHandler::BROKEN_FILE;
 		}
 	}
 
 	/**
-	 * @param $file File
+	 * @param File $file
 	 * @param array $params Rotate parameters.
-	 *	'rotation' clockwise rotation in degrees, allowed are multiples of 90
+	 *    'rotation' clockwise rotation in degrees, allowed are multiples of 90
 	 * @since 1.21
 	 * @return bool
 	 */
@@ -79,16 +145,32 @@ class JpegHandler extends ExifBitmapHandler {
 			wfDebug( __METHOD__ . ": running jpgtran: $cmd\n" );
 			wfProfileIn( 'jpegtran' );
 			$retval = 0;
-			$err = wfShellExecWithStderr( $cmd, $retval, $env );
+			$err = wfShellExecWithStderr( $cmd, $retval );
 			wfProfileOut( 'jpegtran' );
 			if ( $retval !== 0 ) {
 				$this->logErrorForExternalProcess( $retval, $err, $cmd );
+
 				return new MediaTransformError( 'thumbnail_error', 0, 0, $err );
 			}
+
 			return false;
 		} else {
 			return parent::rotate( $file, $params );
 		}
 	}
 
+	public function supportsBucketing() {
+		return true;
+	}
+
+	public function sanitizeParamsForBucketing( $params ) {
+		$params = parent::sanitizeParamsForBucketing( $params );
+
+		// Quality needs to be cleared for bucketing. Buckets need to be default quality
+		if ( isset( $params['quality'] ) ) {
+			unset( $params['quality'] );
+		}
+
+		return $params;
+	}
 }