Merge pull request phpbb#3068 from marc1706/ticket/13204

nickvergessen · nickvergessen · commit c98cceaf22bc · 2014-11-21T22:52:24.000+01:00
[ticket/13204] Tell user that password was incorrect when exceeding attempts
diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php
@@ -232,7 +232,7 @@ public function login($username, $password)
 		// Give status about wrong password...
 		return array(
 			'status'		=> ($show_captcha) ? LOGIN_ERROR_ATTEMPTS : LOGIN_ERROR_PASSWORD,
-			'error_msg'		=> ($show_captcha) ? 'LOGIN_ERROR_ATTEMPTS' : 'LOGIN_ERROR_PASSWORD',
+			'error_msg'		=> 'LOGIN_ERROR_PASSWORD',
 			'user_row'		=> $row,
 		);
 	}

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ public function login($username, $password)`
`232`	`232`	`// Give status about wrong password...`
`233`	`233`	`return array(`
`234`	`234`	`'status' => ($show_captcha) ? LOGIN_ERROR_ATTEMPTS : LOGIN_ERROR_PASSWORD,`
`235`		`- 'error_msg' => ($show_captcha) ? 'LOGIN_ERROR_ATTEMPTS' : 'LOGIN_ERROR_PASSWORD',`
	`235`	`+ 'error_msg' => 'LOGIN_ERROR_PASSWORD',`
`236`	`236`	`'user_row' => $row,`
`237`	`237`	`);`
`238`	`238`	`}`