From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 18 Jan 2014 02:58:00 +0000 (+0000)
Subject: Merge "Improved vague/incomplete $1 thumb.php error messages"
X-Git-Tag: 1.31.0-rc.0~17216
X-Git-Url: http://git.cyclocoop.org/%27.%28%24current%20%3E%202?a=commitdiff_plain;h=31014d0e0b06595042a3c5517bd396a1b6a09fd2;hp=2b03373aaacb887bdefe891295c372aa19238960;p=lhc%2Fweb%2Fwiklou.git

Merge "Improved vague/incomplete $1 thumb.php error messages"
---

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 {