Brion VIBBER has submitted this change and it was merged.
Change subject: Return captcha information via createaccount API only if no
other errors
......................................................................
Return captcha information via createaccount API only if no other errors
Bug: 61704
Change-Id: I707aab2c0accff8ab5a36666c49815106356b2c7
---
M Captcha.php
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/Captcha.php b/Captcha.php
index df9a314..746b890 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -823,23 +823,23 @@
return true;
}
-
+
/**
* Pass extra data back in API results for account creation.
*
* @param ApiCreateAccount $apiModule
- * @param LoginForm &loginForm
- * @param array &$params
- * @return hook return value
+ * @param LoginForm &loginPage
+ * @param array &$result
+ * @return bool: Hook return value
*/
function addNewAccountApiResult( $apiModule, $loginPage, &$result ) {
if ( $result['result'] !== 'Success' &&
$this->needCreateAccountCaptcha() ) {
- $this->addCaptchaAPI( $result );
// If we failed a captcha, override the generic
'Warning' result string
if ( $result['result'] === 'Warning' && isset(
$result['warnings'] ) ) {
foreach ( $result['warnings'] as $warning ) {
if ( $warning['message'] ===
'captcha-createaccount-fail' ) {
+ $this->addCaptchaAPI( $result );
$result['result'] =
'NeedCaptcha';
}
}
--
To view, visit https://gerrit.wikimedia.org/r/118381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I707aab2c0accff8ab5a36666c49815106356b2c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: CSteipp <cste...@wikimedia.org>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
