aboutsummaryrefslogtreecommitdiffstats
path: root/thumb.php
diff options
context:
space:
mode:
authorReedy <reedy@wikimedia.org>2013-10-07 19:46:02 +0100
committerReedy <reedy@wikimedia.org>2013-10-07 19:46:02 +0100
commitf7e7a5ef9aa5f6aa200b96dad2645a84b0967be6 (patch)
tree22c3458901739fea82a58fe5fc6082b1788ea3da /thumb.php
parentb26cbfd830060e14f51294499d4d332c75bc37f0 (diff)
downloadmediawikicore-f7e7a5ef9aa5f6aa200b96dad2645a84b0967be6.tar.gz
mediawikicore-f7e7a5ef9aa5f6aa200b96dad2645a84b0967be6.zip
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
Diffstat (limited to 'thumb.php')
-rw-r--r--thumb.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/thumb.php b/thumb.php
index ef2af249397f..4ffefb686c8c 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;
}
}