X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=includes%2Fapi%2FApiLogin.php;h=e4c4429eb3920bdb4cf869bad112b226efa0f9b9;hb=16c80e429be5904fb42a93f260f8de3d18f0c692;hp=398c8c722b7d49d8558854f1d0b223cce3ab6d77;hpb=cfb04229b2230f40f5ced620a022108779e2b8b2;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php index 398c8c722b..e4c4429eb3 100644 --- a/includes/api/ApiLogin.php +++ b/includes/api/ApiLogin.php @@ -1,9 +1,5 @@ @gmail.com", * Daniel Cannon (cannon dot danielc at gmail dot com) * @@ -41,11 +37,11 @@ class ApiLogin extends ApiBase { parent::__construct( $main, $action, 'lg' ); } - protected function getDescriptionMessage() { + protected function getExtendedDescription() { if ( $this->getConfig()->get( 'EnableBotPasswords' ) ) { - return 'apihelp-login-description'; + return 'apihelp-login-extended-description'; } else { - return 'apihelp-login-description-nobotpasswords'; + return 'apihelp-login-extended-description-nobotpasswords'; } } @@ -134,7 +130,7 @@ class ApiLogin extends ApiBase { $session = $status->getValue(); $authRes = 'Success'; $loginType = 'BotPassword'; - } elseif ( !$botLoginData[2] ) { + } elseif ( !$botLoginData[2] || $status->hasMessage( 'login-throttled' ) ) { $authRes = 'Failed'; $message = $status->getMessage(); LoggerFactory::getInstance( 'authentication' )->info(