Merge "Array to string conversion in TransformationalImageHandler.php:167"

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index 7f307cd..3e3be3d 100644 (file)
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -163,8 +163,14 @@ abstract class TransformationalImageHandler extends ImageHandler {
                # Determine scaler type
                $scaler = $this->getScalerType( $dstPath );
 
+               if ( is_array( $scaler ) ) {
+                       $scalerName = get_class( $scaler[0] );
+               } else {
+                       $scalerName = $scaler;
+               }
+
                wfDebug( __METHOD__ . ": creating {$scalerParams['physicalDimensions']} " .
-                       "thumbnail at $dstPath using scaler $scaler\n" );
+                       "thumbnail at $dstPath using scaler $scalerName\n" );
 
                if ( !$image->mustRender() &&
                        $scalerParams['physicalWidth'] == $scalerParams['srcWidth']