Merge "SpecialMovepage: Use hidden form fields to set hidden data, not the submit...

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

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index 3558149..597ac26 100644 (file)
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -126,6 +126,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
                        'mimeType' => $image->getMimeType(),
                        'dstPath' => $dstPath,
                        'dstUrl' => $dstUrl,
+                       'interlace' => isset( $params['interlace'] ) ? $params['interlace'] : false,
                );
 
                if ( isset( $params['quality'] ) && $params['quality'] === 'low' ) {
@@ -508,9 +509,10 @@ abstract class TransformationalImageHandler extends ImageHandler {
         * @return string|bool Representing the IM version; false on error
         */
        protected function getMagickVersion() {
-               return ObjectCache::newAccelerator( CACHE_NONE )->getWithSetCallback(
-                       "imagemagick-version",
-                       3600,
+               $cache = ObjectCache::getLocalServerInstance( CACHE_NONE );
+               return $cache->getWithSetCallback(
+                       'imagemagick-version',
+                       $cache::TTL_HOUR,
                        function () {
                                global $wgImageMagickConvertCommand;
 
@@ -523,7 +525,6 @@ abstract class TransformationalImageHandler extends ImageHandler {
                                );
                                if ( $x != 1 ) {
                                        wfDebug( __METHOD__ . ": ImageMagick version check failed\n" );
-
                                        return false;
                                }