Better this way :D

git-svn-id: file:///svn/phpbb/trunk@7660 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-05-21 17:50:12 +00:00
parent 93c91c4a91
commit c7853e2a4e
2 changed files with 2 additions and 2 deletions

View file

@ -394,7 +394,7 @@ class cache extends acm
$usernames = array(); $usernames = array();
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$usernames[] = utf8_clean_string(str_replace('%', '.*?', preg_quote($row['disallow_username'], '$#'))); $usernames[] = str_replace('%', '.*?', preg_quote(utf8_clean_string($row['disallow_username']), '#'));
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);

View file

@ -1381,7 +1381,7 @@ function validate_username($username, $allowed_username = false)
foreach ($bad_usernames as $bad_username) foreach ($bad_usernames as $bad_username)
{ {
if (preg_match('#^' . str_replace('#', '\#', $bad_username) . '#', $clean_username)) if (preg_match('#^' . $bad_username . '#', $clean_username))
{ {
return 'USERNAME_DISALLOWED'; return 'USERNAME_DISALLOWED';
} }