aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorGraham Eames <grahamje@users.sourceforge.net>2006-07-08 16:53:42 +0000
committerGraham Eames <grahamje@users.sourceforge.net>2006-07-08 16:53:42 +0000
commit811b63baab82bab6e47c9f3d8e7db99ad1d1fbd6 (patch)
tree7515d6b8c7bf716809ab326e02b1b1c68ada2b90 /phpBB/includes/functions_user.php
parent62230baffd36241108655db91864ee4c82ad5785 (diff)
downloadforums-811b63baab82bab6e47c9f3d8e7db99ad1d1fbd6.tar
forums-811b63baab82bab6e47c9f3d8e7db99ad1d1fbd6.tar.gz
forums-811b63baab82bab6e47c9f3d8e7db99ad1d1fbd6.tar.bz2
forums-811b63baab82bab6e47c9f3d8e7db99ad1d1fbd6.tar.xz
forums-811b63baab82bab6e47c9f3d8e7db99ad1d1fbd6.zip
Fix installation and user registration bugs
git-svn-id: file:///svn/phpbb/trunk@6156 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 7ae4b1a588..937d4f7791 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -243,7 +243,7 @@ function user_add($user_row, $cp_data = false)
group_set_user_default($user_row['group_id'], array($user_id));
// 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 || !$config['email_enable'])
+ if ($user_row['user_type'] == USER_NORMAL && !$config['require_activation'])
{
set_config('newest_user_id', $user_id, true);
set_config('newest_username', $user_row['username'], true);