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
Merge "Add oldRev parameter to DiffRevisionTools hook"
[lhc/web/wiklou.git]
/
includes
/
media
/
Bitmap.php
diff --git
a/includes/media/Bitmap.php
b/includes/media/Bitmap.php
index
1be04a7
..
7f108c8
100644
(file)
--- a/
includes/media/Bitmap.php
+++ b/
includes/media/Bitmap.php
@@
-187,7
+187,9
@@
class BitmapHandler extends ImageHandler {
wfHostname(), $image->getName() ) );
return new MediaTransformError( 'thumbnail_error',
wfHostname(), $image->getName() ) );
return new MediaTransformError( 'thumbnail_error',
- $scalerParams['clientWidth'], $scalerParams['clientHeight'] );
+ $scalerParams['clientWidth'], $scalerParams['clientHeight'],
+ wfMessage( 'filemissing' )->text()
+ );
}
# Try a hook
}
# Try a hook
@@
-227,7
+229,9
@@
class BitmapHandler extends ImageHandler {
} elseif ( $removed ) {
# Thumbnail was zero-byte and had to be removed
return new MediaTransformError( 'thumbnail_error',
} elseif ( $removed ) {
# Thumbnail was zero-byte and had to be removed
return new MediaTransformError( 'thumbnail_error',
- $scalerParams['clientWidth'], $scalerParams['clientHeight'] );
+ $scalerParams['clientWidth'], $scalerParams['clientHeight'],
+ wfMessage( 'unknown-error' )->text()
+ );
} elseif ( $mto ) {
return $mto;
} else {
} elseif ( $mto ) {
return $mto;
} else {