From 811b63baab82bab6e47c9f3d8e7db99ad1d1fbd6 Mon Sep 17 00:00:00 2001 From: Graham Eames Date: Sat, 8 Jul 2006 16:53:42 +0000 Subject: [PATCH] Fix installation and user registration bugs git-svn-id: file:///svn/phpbb/trunk@6156 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_user.php | 2 +- phpBB/install/install_install.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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); diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 9e0a3cc002..84abf629a4 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1478,6 +1478,7 @@ class install_install extends module 'user_email' => '', 'user_lang' => $language, 'user_style' => 1, + 'user_timezone' => 0, 'user_dateformat' => $lang['default_dateformat'], );