diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-07-23 04:14:49 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-07-23 04:14:49 +0000 |
| commit | e61e01a3b93a57139efc433d892e10dd66a32b71 (patch) | |
| tree | 70328a6b9274e2a598a1239e7606f74cd079348a /phpBB/includes/functions_user.php | |
| parent | 092fb766419d72a61032a06ce7359ccfe5af29d1 (diff) | |
| download | forums-e61e01a3b93a57139efc433d892e10dd66a32b71.tar forums-e61e01a3b93a57139efc433d892e10dd66a32b71.tar.gz forums-e61e01a3b93a57139efc433d892e10dd66a32b71.tar.bz2 forums-e61e01a3b93a57139efc433d892e10dd66a32b71.tar.xz forums-e61e01a3b93a57139efc433d892e10dd66a32b71.zip | |
- a better way of checking PCRE property support
- fixed the naming of a variable or two
git-svn-id: file:///svn/phpbb/trunk@7925 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 96f9b75964..4de247d33c 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1284,7 +1284,7 @@ function validate_username($username, $allowed_username = false) $mbstring = $pcre = false; // generic UTF-8 character types supported? - if (version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>='))) + if ((version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>='))) && @preg_match('/\p{L}/u', 'a') !== false) { $pcre = true; } @@ -1435,7 +1435,7 @@ function validate_password($password) $pcre = $mbstring = false; // generic UTF-8 character types supported? - if (version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>='))) + if ((version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>='))) && @preg_match('/\p{L}/u', 'a') !== false) { $upp = '\p{Lu}'; $low = '\p{Ll}'; |