X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/rappels.php?a=blobdiff_plain;f=includes%2Fmedia%2FTransformationalImageHandler.php;h=85430d2c23de323852aa3fef3740d440755ddc25;hb=dcee65673b531ebe39a093ee0c021a926ea74ad9;hp=32208cca709cc4495c65edc58fe33a495b0fdf7b;hpb=d6276525455e6a00fffc90229ef81a1fc8feaa25;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php index 32208cca70..85430d2c23 100644 --- a/includes/media/TransformationalImageHandler.php +++ b/includes/media/TransformationalImageHandler.php @@ -221,7 +221,7 @@ abstract class TransformationalImageHandler extends ImageHandler { } # Try a hook. Called "Bitmap" for historical reasons. - /** @var $mto MediaTransformOutput */ + /** @var MediaTransformOutput $mto */ $mto = null; Hooks::run( 'BitmapHandlerTransform', [ $this, $image, &$scalerParams, &$mto ] ); if ( !is_null( $mto ) ) { @@ -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;