aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2006-12-19 02:37:36 +0000
committerDavid M <davidmj@users.sourceforge.net>2006-12-19 02:37:36 +0000
commitc32156a616b46ef3478c4cb2d37f5721fdbedcd6 (patch)
treeb57a7f86e055935b5f9a2dc0a1be0e163de1ea02 /phpBB/includes/functions_user.php
parent7ca8a4a6626345fa7444cbbbb36b678e31688258 (diff)
downloadforums-c32156a616b46ef3478c4cb2d37f5721fdbedcd6.tar
forums-c32156a616b46ef3478c4cb2d37f5721fdbedcd6.tar.gz
forums-c32156a616b46ef3478c4cb2d37f5721fdbedcd6.tar.bz2
forums-c32156a616b46ef3478c4cb2d37f5721fdbedcd6.tar.xz
forums-c32156a616b46ef3478c4cb2d37f5721fdbedcd6.zip
don't mind me...
git-svn-id: file:///svn/phpbb/trunk@6782 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php15
1 files changed, 12 insertions, 3 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 6a9fc0922d..6cd35bfd7f 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -245,7 +245,7 @@ function user_add($user_row, $cp_data = false)
$db->sql_query($sql);
// Now make it the users default group...
- group_set_user_default($user_row['group_id'], array($user_id), false, $user_row['user_type'] == USER_NORMAL);
+ group_set_user_default($user_row['group_id'], array($user_id), false);
// set the newest user and adjust the user count if the user is a normal user and no activation mail is sent
if ($user_row['user_type'] == USER_NORMAL)
@@ -253,6 +253,15 @@ function user_add($user_row, $cp_data = false)
set_config('newest_user_id', $user_id, true);
set_config('newest_username', $user_row['username'], true);
set_config('num_users', $config['num_users'] + 1, true);
+
+ $sql = 'SELECT group_colour
+ FROM ' . GROUPS_TABLE . '
+ WHERE group_id = ' . $user_row['group_id'];
+ $result = $db->sql_query_limit($sql, 1);
+ $row = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
+
+ set_config('newest_user_colour', $row['group_colour'], true);
}
return $user_id;
@@ -2044,7 +2053,7 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
/**
* Set users default group
*/
-function group_set_user_default($group_id, $user_id_ary, $group_attributes = false, $new_user = false)
+function group_set_user_default($group_id, $user_id_ary, $group_attributes = false)
{
global $db;
@@ -2130,7 +2139,7 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal
global $config;
- if ($new_user || in_array($config['newest_user_id'], $user_id_ary))
+ if (in_array($config['newest_user_id'], $user_id_ary))
{
set_config('newest_user_colour', $sql_ary['user_colour'], true);
}