From: Brian Wolff <bawolff+wn@gmail.com>
Date: Sat, 28 Sep 2013 21:35:41 +0000 (-0300)
Subject: Include error code in error message when convert fails
X-Git-Tag: 1.31.0-rc.0~17714
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=2a4823b1d10c1f1a965e944699420f1a04913782;p=lhc%2Fweb%2Fwiklou.git

Include error code in error message when convert fails

This info is logged, but it makes it much easier to debug
things if the info is right there.

Change-Id: I3a331a19a13a932c6b7aefdd9885ad351f3f48e3
---

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 13849f442a..d93168f2ae 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -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