jenkins-bot has submitted this change and it was merged.
Change subject: Fix "Unsupported operand types at thumb.php on line 429"
......................................................................
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
(cherry picked from commit f7e7a5ef9aa5f6aa200b96dad2645a84b0967be6)
---
M thumb.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/thumb.php b/thumb.php
index ef2af24..4ffefb6 100644
--- a/thumb.php
+++ b/thumb.php
@@ -425,7 +425,7 @@
if ( $handler && $fileNamePos !== false ) {
$paramString = substr( $thumbname, 0, $fileNamePos - 1 );
$extraParams = $handler->parseParamString( $paramString );
- if ( $handler !== false ) {
+ if ( $extraParams !== false ) {
return $params + $extraParams;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/88184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iedb940d9f1ad4d137b9732e7e624e55d05bc2c96
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf20
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
