[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.109,1.110

[James A. <th...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv5082/includes

Modified Files:
	functions.php 
Log Message:
Fixed bug #507473 

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -r1.109 -r1.110
*** functions.php	2002/01/31 01:16:10	1.109
--- functions.php	2002/02/03 19:19:42	1.110
***************
*** 498,502 ****
  function validate_username($username)
  {
! 	global $db, $lang;
  
  	$sql = "SELECT u.username, g.group_name
--- 498,502 ----
  function validate_username($username)
  {
! 	global $db, $lang, $userdata;
  
  	$sql = "SELECT u.username, g.group_name
***************
*** 508,514 ****
  	if ( $result = $db->sql_query($sql) )
  	{
! 		if ( $db->sql_fetchrow($result) )
  		{
! 			return array('error' => $lang['Username_taken']);
  		}
  	}
--- 508,528 ----
  	if ( $result = $db->sql_query($sql) )
  	{
! 		if ( $row = $db->sql_fetchrow($result) )
  		{
! 			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']);
! 			}
  		}
  	}