dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Include error code in error message when convert fails
[lhc/web/wiklou.git]
/
includes
/
media
/
Bitmap.php
diff --git
a/includes/media/Bitmap.php
b/includes/media/Bitmap.php
index
13849f4
..
d93168f
100644
(file)
--- 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