aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorrxu <rxu@mail.ru>2011-03-15 22:21:43 +0700
committerAndreas Fischer <bantu@phpbb.com>2011-04-01 15:10:29 +0200
commita83518982394f93e843e68f663fd39b2d6fd5150 (patch)
tree987ddbb8b63ee8fc882a9daabd472a272fc4460f /phpBB/includes/functions_user.php
parent6ac93d8a00ba54158e429fdfd29f356805781cfc (diff)
downloadforums-a83518982394f93e843e68f663fd39b2d6fd5150.tar
forums-a83518982394f93e843e68f663fd39b2d6fd5150.tar.gz
forums-a83518982394f93e843e68f663fd39b2d6fd5150.tar.bz2
forums-a83518982394f93e843e68f663fd39b2d6fd5150.tar.xz
forums-a83518982394f93e843e68f663fd39b2d6fd5150.zip
[ticket/9751] Password requirement "Must contain letters and numbers" fails
PHPBB3-9751
Diffstat (limited to 'phpBB/includes/functions_user.php')
-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 8a204995aa..88e07f729c 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1617,7 +1617,6 @@ function validate_password($password)
{
$upp = '\p{Lu}';
$low = '\p{Ll}';
- $let = '\p{L}';
$num = '\p{N}';
$sym = '[^\p{Lu}\p{Ll}\p{N}]';
$pcre = true;
@@ -1627,7 +1626,6 @@ function validate_password($password)
mb_regex_encoding('UTF-8');
$upp = '[[:upper:]]';
$low = '[[:lower:]]';
- $let = '[[:lower:][:upper:]]';
$num = '[[:digit:]]';
$sym = '[^[:upper:][:lower:][:digit:]]';
$mbstring = true;
@@ -1636,7 +1634,6 @@ function validate_password($password)
{
$upp = '[A-Z]';
$low = '[a-z]';
- $let = '[a-zA-Z]';
$num = '[0-9]';
$sym = '[^A-Za-z0-9]';
$pcre = true;
@@ -1652,7 +1649,8 @@ function validate_password($password)
break;
case 'PASS_TYPE_ALPHA':
- $chars[] = $let;
+ $chars[] = $low;
+ $chars[] = $upp;
$chars[] = $num;
break;