Fix "Unsupported operand types at thumb.php on line 429"
authorReedy <reedy@wikimedia.org>
Mon, 7 Oct 2013 18:46:02 +0000 (19:46 +0100)
committerReedy <reedy@wikimedia.org>
Mon, 7 Oct 2013 18:46:02 +0000 (19:46 +0100)
Return type of $handler->parseParamString() wasn't evaluated,
instead $handler value was compared again

Bug: 55437
Change-Id: Iedb940d9f1ad4d137b9732e7e624e55d05bc2c96

thumb.php

index ef2af24..4ffefb6 100644 (file)
--- 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;
                }
        }