X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FTransformationalImageHandler.php;h=38dc3905b952f4fce281d193592f880af1b5ce4a;hb=c1c3302286deb92f3eb81a39b5ee61f8c413f5ad;hp=de438da2cf9511fd2d428ac8aa3642cc8deca0c5;hpb=5fa4cdf860c79b32ab6ef034c6d9420c2727f695;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index de438da2cf..38dc3905b9 100644
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -41,7 +41,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
 	 * 'physicalWidth' and 'physicalHeight' indicate the thumbnail dimensions.
 	 * @return bool
 	 */
-	function normaliseParams( $image, &$params ) {
+	public function normaliseParams( $image, &$params ) {
 		if ( !parent::normaliseParams( $image, $params ) ) {
 			return false;
 		}
@@ -127,7 +127,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
 			'mimeType' => $image->getMimeType(),
 			'dstPath' => $dstPath,
 			'dstUrl' => $dstUrl,
-			'interlace' => isset( $params['interlace'] ) ? $params['interlace'] : false,
+			'interlace' => $params['interlace'] ?? false,
 		];
 
 		if ( isset( $params['quality'] ) && $params['quality'] === 'low' ) {
@@ -512,7 +512,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
 		$cache = MediaWikiServices::getInstance()->getLocalServerObjectCache();
 		$method = __METHOD__;
 		return $cache->getWithSetCallback(
-			'imagemagick-version',
+			$cache->makeGlobalKey( 'imagemagick-version' ),
 			$cache::TTL_HOUR,
 			function () use ( $method ) {
 				global $wgImageMagickConvertCommand;