jenkins-bot has submitted this change and it was merged.

Change subject: Update ConfirmAccount for ConfirmEdit changes
......................................................................


Update ConfirmAccount for ConfirmEdit changes

Bug: T141418
Change-Id: If1c311c6b79ac847f2ec1679f68a30d6bb6c7122
Depends-On: I25f344538052fc18993c43185fbd97804a7cfc81
---
M frontend/specialpages/actions/RequestAccount_body.php
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/frontend/specialpages/actions/RequestAccount_body.php 
b/frontend/specialpages/actions/RequestAccount_body.php
index dbabcbc..f9388ac 100755
--- a/frontend/specialpages/actions/RequestAccount_body.php
+++ b/frontend/specialpages/actions/RequestAccount_body.php
@@ -245,10 +245,16 @@
                        && $wgCaptchaTriggers['createaccount'] && 
!$reqUser->isAllowed( 'skipcaptcha' ) )
                {
                        $captcha = new $wgCaptchaClass;
+
+                       $formInformation = $captcha->getFormInformation();
+                       $formMetainfo = $formInformation;
+                       unset( $formMetainfo['html'] );
+                       $captcha->addFormInformationToOutput( $out, 
$formMetainfo );
+
                        # Hook point to add captchas
                        $form .= '<fieldset>';
                        $form .= $this->msg( 'captcha-createaccount' 
)->parseAsBlock();
-                       $form .= $captcha->getForm( $out );
+                       $form .= $formInformation['html'];
                        $form .= '</fieldset>';
                }
                $form .= Html::Hidden( 'title', 
$this->getPageTitle()->getPrefixedDBKey() ) . "\n";

-- 
To view, visit https://gerrit.wikimedia.org/r/302855
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If1c311c6b79ac847f2ec1679f68a30d6bb6c7122
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmAccount
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to