From: Reedy <reedy@wikimedia.org>
Date: Mon, 7 Oct 2013 18:46:02 +0000 (+0100)
Subject: Fix "Unsupported operand types at thumb.php on line 429"
X-Git-Tag: 1.31.0-rc.0~18586
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=f7e7a5ef9aa5f6aa200b96dad2645a84b0967be6;p=lhc%2Fweb%2Fwiklou.git

Fix "Unsupported operand types at thumb.php on line 429"

Return type of $handler->parseParamString() wasn't evaluated,
instead $handler value was compared again

Bug: 55437
Change-Id: Iedb940d9f1ad4d137b9732e7e624e55d05bc2c96
---

diff --git a/thumb.php b/thumb.php
index ef2af24939..4ffefb686c 100644
--- a/thumb.php
+++ b/thumb.php
@@ -425,7 +425,7 @@ function wfExtractThumbParams( $file, $params ) {
 	if ( $handler && $fileNamePos !== false ) {
 		$paramString = substr( $thumbname, 0, $fileNamePos - 1 );
 		$extraParams = $handler->parseParamString( $paramString );
-		if ( $handler !== false ) {
+		if ( $extraParams !== false ) {
 			return $params + $extraParams;
 		}
 	}