mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-31 03:29:23 +02:00
Fixed bug #507473
git-svn-id: file:///svn/phpbb/trunk@2049 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
721207ef48
commit
225a4ff8e7
@ -497,7 +497,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
|
||||
//
|
||||
function validate_username($username)
|
||||
{
|
||||
global $db, $lang;
|
||||
global $db, $lang, $userdata;
|
||||
|
||||
$sql = "SELECT u.username, g.group_name
|
||||
FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
|
||||
@ -507,9 +507,23 @@ function validate_username($username)
|
||||
OR LOWER(g.group_name) = '" . strtolower(str_replace("\'", "''", $username)) . "' )";
|
||||
if ( $result = $db->sql_query($sql) )
|
||||
{
|
||||
if ( $db->sql_fetchrow($result) )
|
||||
if ( $row = $db->sql_fetchrow($result) )
|
||||
{
|
||||
return array('error' => $lang['Username_taken']);
|
||||
if($userdata['session_logged_in'])
|
||||
{
|
||||
if($row['username'] != $userdata['username'])
|
||||
{
|
||||
return array('error' => $lang['Username_taken']);
|
||||
}
|
||||
else
|
||||
{
|
||||
return array('error' => '');
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return array('error' => $lang['Username_taken']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user