aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/functions_user.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 53fb65d0f0..08ccfa030f 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -143,9 +143,16 @@ function user_add($user_row, $cp_data = false)
return false;
}
+ $username_clean = utf8_clean_string($user_row['username']);
+
+ if (empty($username_clean))
+ {
+ return false;
+ }
+
$sql_ary = array(
'username' => $user_row['username'],
- 'username_clean' => utf8_clean_string($user_row['username']),
+ 'username_clean' => $username_clean,
'user_password' => (isset($user_row['user_password'])) ? $user_row['user_password'] : '',
'user_pass_convert' => 0,
'user_email' => strtolower($user_row['user_email']),
@@ -1262,7 +1269,7 @@ function validate_username($username, $allowed_username = false)
}
// ... fast checks first.
- if (strpos($username, '"') !== false || strpos($username, '"') !== false)
+ if (strpos($username, '"') !== false || strpos($username, '"') !== false || empty($clean_username))
{
return 'INVALID_CHARS';
}