diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-07-27 16:20:58 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-07-27 16:20:58 +0200 |
| commit | 812edebfb7e702f7e4048d8c14da7328c65b008d (patch) | |
| tree | 08d1150de4a790561aa8be7d6d943b0eb45d3f40 | |
| parent | 31192fc08e2cc12efa0a59a2edb9128ed806d3db (diff) | |
| parent | 65ff149fc909583d320e93536ac232aa374c8e4f (diff) | |
| download | forums-812edebfb7e702f7e4048d8c14da7328c65b008d.tar forums-812edebfb7e702f7e4048d8c14da7328c65b008d.tar.gz forums-812edebfb7e702f7e4048d8c14da7328c65b008d.tar.bz2 forums-812edebfb7e702f7e4048d8c14da7328c65b008d.tar.xz forums-812edebfb7e702f7e4048d8c14da7328c65b008d.zip | |
Merge branch '3.2.x' into 3.3.x
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 2d1eaadfae..fd4b5e8c24 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -855,7 +855,7 @@ class acp_users $check_ary += array( 'username' => array( array('string', false, $config['min_name_chars'], $config['max_name_chars']), - array('username', $user_row['username']) + array('username', $user_row['username'], true) ), ); } diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index fb9241d4aa..3bf4aa16b7 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1732,7 +1732,7 @@ function phpbb_validate_timezone($timezone) * @return mixed Either false if validation succeeded or a string which will be * used as the error message (with the variable name appended) */ -function validate_username($username, $allowed_username = false) +function validate_username($username, $allowed_username = false, $allow_all_names = false) { global $config, $db, $user, $cache; @@ -1815,13 +1815,16 @@ function validate_username($username, $allowed_username = false) return 'USERNAME_TAKEN'; } - $bad_usernames = $cache->obtain_disallowed_usernames(); - - foreach ($bad_usernames as $bad_username) + if (!$allow_all_names) { - if (preg_match('#^' . $bad_username . '$#', $clean_username)) + $bad_usernames = $cache->obtain_disallowed_usernames(); + + foreach ($bad_usernames as $bad_username) { - return 'USERNAME_DISALLOWED'; + if (preg_match('#^' . $bad_username . '$#', $clean_username)) + { + return 'USERNAME_DISALLOWED'; + } } } |