aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-06-15 15:02:16 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-06-15 15:02:16 +0200
commitfe690779d4439071194ee3d047363ccd5fff4538 (patch)
tree8a48e8364a589f1bc94684e8b9fdcc88c60e0edf /phpBB/includes/functions_user.php
parent2cf57822bb4607d595affaef2264f064cb984c55 (diff)
parent6c7d16894b38ed67480813372e08b308b81bcabf (diff)
downloadforums-fe690779d4439071194ee3d047363ccd5fff4538.tar
forums-fe690779d4439071194ee3d047363ccd5fff4538.tar.gz
forums-fe690779d4439071194ee3d047363ccd5fff4538.tar.bz2
forums-fe690779d4439071194ee3d047363ccd5fff4538.tar.xz
forums-fe690779d4439071194ee3d047363ccd5fff4538.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9623] Proper UTF8 encoding for usernames in pruning section [ticket/9633] Newly Registered Group Colour not used in "Our Newest Member" [ticket/9179] Remove unnecessary newline. [ticket/9147] "Change topic type"-option "Normal" always selected.
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 21e82030ee..271542efdd 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -297,6 +297,7 @@ function user_add($user_row, $cp_data = false)
if ($config['new_member_group_default'])
{
group_user_add($add_group_id, $user_id, false, false, true);
+ $user_row['group_id'] = $add_group_id;
}
else
{