diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:17:42 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:17:42 -0400 |
commit | f7d4cf9ed0ae68fec630d14e8f6aade38e49f036 (patch) | |
tree | a730c57badbe0e2f0f064ca2006c82d4b6ed54ea /includes/specials/SpecialUserlogin.php | |
parent | aee35e4a93d105024bcae947cd8b16c962191f5c (diff) | |
parent | 5d1e7dd0ccda0984ccf3e8e3d0f88ac888b05819 (diff) |
Merge commit '5d1e7'
Diffstat (limited to 'includes/specials/SpecialUserlogin.php')
-rw-r--r-- | includes/specials/SpecialUserlogin.php | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index 6de7c90d..24b636b1 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -538,14 +538,11 @@ class LoginForm extends SpecialPage { return Status::newFatal( 'badretype' ); } - # check for minimal password length - $valid = $u->getPasswordValidity( $this->mPassword ); - if ( $valid !== true ) { - if ( !is_array( $valid ) ) { - $valid = array( $valid, $wgMinimalPasswordLength ); - } - - return call_user_func_array( 'Status::newFatal', $valid ); + # check for password validity, return a fatal Status if invalid + $validity = $u->checkPasswordValidity( $this->mPassword ); + if ( !$validity->isGood() ) { + $validity->ok = false; // make sure this Status is fatal + return $validity; } } |