From: Gergő Tisza <tgr.huwiki@gmail.com>
Date: Thu, 5 Feb 2015 02:16:06 +0000 (+0000)
Subject: Handle missing width nicely in thumb.php
X-Git-Tag: 1.31.0-rc.0~12454^2
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=769e7e339eea54bcd447f2d3882be2dcbc35b418;p=lhc%2Fweb%2Fwiklou.git

Handle missing width nicely in thumb.php

Bug: T88508
Change-Id: I2cbe4ab914a9edba71461b194151938feeafeb11
---

diff --git a/autoload.php b/autoload.php
index 948a6aa421..8542e5f7f1 100644
--- a/autoload.php
+++ b/autoload.php
@@ -725,6 +725,7 @@ $wgAutoloadLocalClasses = array(
 	'MediaHandler' => __DIR__ . '/includes/media/MediaHandler.php',
 	'MediaStatisticsPage' => __DIR__ . '/includes/specials/SpecialMediaStatistics.php',
 	'MediaTransformError' => __DIR__ . '/includes/media/MediaTransformOutput.php',
+	'MediaTransformInvalidParametersException' => __DIR__ . '/includes/media/MediaTransformInvalidParametersException.php',
 	'MediaTransformOutput' => __DIR__ . '/includes/media/MediaTransformOutput.php',
 	'MediaWiki' => __DIR__ . '/includes/MediaWiki.php',
 	'MediaWikiBagOStuff' => __DIR__ . '/includes/objectcache/SqlBagOStuff.php',
diff --git a/includes/media/ImageHandler.php b/includes/media/ImageHandler.php
index 6dd0453ef1..787f21e443 100644
--- a/includes/media/ImageHandler.php
+++ b/includes/media/ImageHandler.php
@@ -57,7 +57,7 @@ abstract class ImageHandler extends MediaHandler {
 		} elseif ( isset( $params['width'] ) ) {
 			$width = $params['width'];
 		} else {
-			throw new MWException( 'No width specified to ' . __METHOD__ );
+			throw new MediaTransformInvalidParametersException( 'No width specified to ' . __METHOD__ );
 		}
 
 		# Removed for ProofreadPage
diff --git a/includes/media/MediaTransformInvalidParametersException.php b/includes/media/MediaTransformInvalidParametersException.php
new file mode 100644
index 0000000000..15a2ca5546
--- /dev/null
+++ b/includes/media/MediaTransformInvalidParametersException.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * MediaWiki exception thrown by some methods when the transform parameter array is invalid
+ *
+ * @ingroup Exception
+ */
+class MediaTransformInvalidParametersException extends MWException {}
diff --git a/thumb.php b/thumb.php
index ebcf79f743..999ffb2669 100644
--- a/thumb.php
+++ b/thumb.php
@@ -252,10 +252,12 @@ function wfStreamThumb( array $params ) {
 	try {
 		$thumbName = $img->thumbName( $params );
 		if ( !strlen( $thumbName ) ) { // invalid params?
-			wfThumbError( 400, 'The specified thumbnail parameters are not valid.' );
-			return;
+			throw new MediaTransformInvalidParametersException( 'Empty return from File::thumbName' );
 		}
 		$thumbName2 = $img->thumbName( $params, File::THUMB_FULL_NAME ); // b/c; "long" style
+	} catch ( MediaTransformInvalidParametersException $e ) {
+		wfThumbError( 400, 'The specified thumbnail parameters are not valid: ' . $e->getMessage() );
+		return;
 	} catch ( MWException $e ) {
 		wfThumbError( 500, $e->getHTML() );
 		return;