Merge "Wrap changes lists in <div class="mw-changeslist" />"

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

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 13849f4..eeb8078 100644 (file)
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -67,7 +67,7 @@ class BitmapHandler extends ImageHandler {
 
                        if ( $srcWidth * $srcHeight > $wgMaxImageArea
                                && !( $image->getMimeType() == 'image/jpeg'
-                               && self::getScalerType( false, false ) == 'im' )
+                                       && self::getScalerType( false, false ) == 'im' )
                        ) {
                                # Only ImageMagick can efficiently downsize jpg images without loading
                                # the entire file in memory
@@ -382,7 +382,7 @@ class BitmapHandler extends ImageHandler {
                if ( $retval !== 0 ) {
                        $this->logErrorForExternalProcess( $retval, $err, $cmd );
 
-                       return $this->getMediaTransformError( $params, $err );
+                       return $this->getMediaTransformError( $params, "$err\nError code: $retval" );
                }
 
                return false; # No error