From: Reedy <reedy@wikimedia.org>
Date: Wed, 17 Sep 2014 15:55:42 +0000 (+0100)
Subject: Array to string conversion in TransformationalImageHandler.php:167
X-Git-Tag: 1.31.0-rc.0~13981^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=e99e2ea076332ddbe1d94af820414744f87d69f5;p=lhc%2Fweb%2Fwiklou.git

Array to string conversion in TransformationalImageHandler.php:167

Bug: 70902
Change-Id: Ia5e0949fc18275955dd1d320f8d538e3f2a7855b
---

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index 13fb52b6d3..671f0c5499 100644
--- 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']