From b6688f5b023c884939a0008401abdf25858df786 Mon Sep 17 00:00:00 2001
From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Fri, 11 Feb 2011 15:31:52 +0000
Subject: [PATCH] Follow-up r81558: Only raise a warning if no image handler
 could be found

---
 includes/api/ApiQueryImageInfo.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index e612a60ac3..f742db4ce6 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -248,8 +248,9 @@ class ApiQueryImageInfo extends ApiQueryBase {
 
 		$h = $image->getHandler();
 		if ( !$h ) {
-			// No handler, so no value for iiurlparam is valid.
-			$this->dieUsage( "Invalid value for {$p}urlparam", "urlparam" );
+			$this->setWarning( 'Could not create thumbnail because ' . 
+				$image->getName() . ' does not have an associated image handler' );
+			return;
 		}
 		foreach ( $thumbParams as $name => $value ) {
 			if ( !$h->validateParam( $name, $value ) ) {
-- 
2.20.1