diff options
| author | Reedy <reedy@wikimedia.org> | 2014-09-17 16:55:42 +0100 |
|---|---|---|
| committer | Reedy <reedy@wikimedia.org> | 2014-09-17 16:55:42 +0100 |
| commit | e99e2ea076332ddbe1d94af820414744f87d69f5 (patch) | |
| tree | 350b15d86a6fa51cd9705415023c2423015ef898 | |
| parent | 0011f2a77fdc509a3809023eb294cec32960359d (diff) | |
| download | mediawikicore-e99e2ea076332ddbe1d94af820414744f87d69f5.tar.gz mediawikicore-e99e2ea076332ddbe1d94af820414744f87d69f5.zip | |
Array to string conversion in TransformationalImageHandler.php:167
Bug: 70902
Change-Id: Ia5e0949fc18275955dd1d320f8d538e3f2a7855b
| -rw-r--r-- | includes/media/TransformationalImageHandler.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php index 13fb52b6d374..671f0c549937 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'] |