aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_user.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 6ac6317dd2..89ce52dc39 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1605,8 +1605,9 @@ function validate_password($password)
{
global $config, $db, $user;
- if ($password === '')
+ if ($password === '' || $config['pass_complex'] === 'PASS_TYPE_ANY')
{
+ // Password empty or no password complexity required.
return false;
}
@@ -1659,9 +1660,6 @@ function validate_password($password)
case 'PASS_TYPE_CASE':
$chars[] = $low;
$chars[] = $upp;
-
- // No requirements
- case 'PASS_TYPE_ANY':
}
if ($pcre)