diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-04-19 22:58:15 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-04-19 22:58:15 +0000 |
| commit | 8a668ffe676f945afe4c5278c035082d31891d3b (patch) | |
| tree | cee15102c264d9c23cc1adf062bc82ea7cebd576 /phpBB/includes | |
| parent | 7bc490b9bcd8781ff11634a06695aadcaedf4c70 (diff) | |
| download | forums-8a668ffe676f945afe4c5278c035082d31891d3b.tar forums-8a668ffe676f945afe4c5278c035082d31891d3b.tar.gz forums-8a668ffe676f945afe4c5278c035082d31891d3b.tar.bz2 forums-8a668ffe676f945afe4c5278c035082d31891d3b.tar.xz forums-8a668ffe676f945afe4c5278c035082d31891d3b.zip | |
#9931
git-svn-id: file:///svn/phpbb/trunk@7376 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_user.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index cccebfbc56..d335c32cd5 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1211,7 +1211,7 @@ function validate_username($username, $allowed_username = false) case 'USERNAME_ALPHA_SPACERS': $pcre = true; - $regex = '[-\]_+ ]+'; + $regex = '[A-Za-z-\]_+ ]+'; break; case 'USERNAME_LETTER_NUM': diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 9b28fa0cf6..8c749a1bd6 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -496,8 +496,6 @@ class ucp_register break; } - $user_char_ary = array('.*' => 'USERNAME_CHARS_ANY', '[a-z]+' => 'USERNAME_ALPHA_ONLY', '[-\]_+ [a-z]+' => 'USERNAME_ALPHA_SPACERS', '\w+' => 'USERNAME_LETTER_NUM', '[-\]_+ [\w]+' => 'USERNAME_LETTER_NUM_SPACERS', '[\x01-\x7F]+' => 'USERNAME_ASCII'); - $template->assign_vars(array( 'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '', 'USERNAME' => $data['username'], |