Merge "RCLFilters: make target and to/from parameters sticky again"

[lhc/web/wiklou.git] / includes / media / TransformationalImageHandler.php

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index 32208cc..85430d2 100644 (file)
--- 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;