jenkins-bot has submitted this change and it was merged. Change subject: AuthManagerSpecialPage: Don't use fixed submit/info class for submit button check ......................................................................
AuthManagerSpecialPage: Don't use fixed submit/info class for submit button check It's possible that an authentication extension implements its own HTMLForm classes for a submit button or info field. To omit the default submit button of HTMLForm in these cases, too, it's necessary to check if one of the provided HTMLForm field classes inherit from HTMLSubmitField or HTMLInfoField (assuming, that subclasses in extensions inherit from one of them). Bug: T137236 Change-Id: Id0ec914088b527a9c7224d545b04986068138f93 (cherry picked from commit 3211b058fe233912c9528c8c7e122aa11d7c8f61) --- M includes/specialpage/AuthManagerSpecialPage.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specialpage/AuthManagerSpecialPage.php b/includes/specialpage/AuthManagerSpecialPage.php index 41380f0..9833c73 100644 --- a/includes/specialpage/AuthManagerSpecialPage.php +++ b/includes/specialpage/AuthManagerSpecialPage.php @@ -570,7 +570,8 @@ } elseif ( array_key_exists( 'type', $item ) ) { $class = HTMLForm::$typeMappings[$item['type']]; } - return !in_array( $class, [ 'HTMLInfoField', 'HTMLSubmitField' ], true ); + return !is_a( $class, \HTMLInfoField::class, true ) && + !is_a( $class, \HTMLSubmitField::class, true ); } ); } -- To view, visit https://gerrit.wikimedia.org/r/293776 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id0ec914088b527a9c7224d545b04986068138f93 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_27 Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits