From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 8 Jan 2014 09:38:42 +0000 (-0800)
Subject: Improved vague/incomplete $1 thumb.php error messages
X-Git-Tag: 1.31.0-rc.0~17216^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/cloturer.php?a=commitdiff_plain;h=0177cb82cd3451e3c56546de1b62a062f14cb8d4;p=lhc%2Fweb%2Fwiklou.git

Improved vague/incomplete $1 thumb.php error messages

Change-Id: I64d05e25f82242e92abbcbf20252fc17d5790d8b
---

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 1be04a717b..7f108c8663 100644
--- 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',
-				$scalerParams['clientWidth'], $scalerParams['clientHeight'] );
+				$scalerParams['clientWidth'], $scalerParams['clientHeight'],
+				wfMessage( 'filemissing' )->text()
+			);
 		}
 
 		# 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',
-				$scalerParams['clientWidth'], $scalerParams['clientHeight'] );
+				$scalerParams['clientWidth'], $scalerParams['clientHeight'],
+				wfMessage( 'unknown-error' )->text()
+			);
 		} elseif ( $mto ) {
 			return $mto;
 		} else {