From: Brian Wolff <bawolff+wn@gmail.com>
Date: Fri, 13 Dec 2013 08:54:20 +0000 (-0700)
Subject: Fix error handling in File::createThumb.
X-Git-Tag: 1.31.0-rc.0~17651^2
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=a513f46b80397a3f8fab697f57ec303b56deaa31;p=lhc%2Fweb%2Fwiklou.git

Fix error handling in File::createThumb.

Was checking for null, but transform always returns either
false or an object.

createThumb isn't used in core, but some extensions use it.

Bug: 58436
Change-Id: Icaf5088a193dc1d9b9c365f92722bef1f9c1dba6
---

diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 1c9d8aacf5..dc35016d1f 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -904,7 +904,7 @@ abstract class File {
 			$params['height'] = $height;
 		}
 		$thumb = $this->transform( $params );
-		if ( is_null( $thumb ) || $thumb->isError() ) {
+		if ( !$thumb || $thumb->isError() ) {
 			return '';
 		}