diff options
| -rw-r--r-- | phpBB/includes/functions_user.php | 19 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 13 |
2 files changed, 18 insertions, 14 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 82a02eeb4b..f79a8998c4 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -161,10 +161,10 @@ function user_update_name($old_name, $new_name) * * @param mixed $user_row An array containing the following keys (and the appropriate values): username, group_id (the group to place the user in), user_email and the user_type(usually 0). Additional entries not overridden by defaults will be forwarded. * @param string $cp_data custom profile fields, see custom_profile::build_insert_sql_array - * @param array $notifications_data The notifications settings for the new user +* @param array $notifications_data The notifications settings for the new user * @return the new user's ID. */ -function user_add($user_row, $cp_data = false, $notifications_data = array()) +function user_add($user_row, $cp_data = false, $notifications_data = null) { global $db, $user, $auth, $config, $phpbb_root_path, $phpEx; global $phpbb_dispatcher, $phpbb_container; @@ -348,6 +348,21 @@ function user_add($user_row, $cp_data = false, $notifications_data = array()) set_config('newest_user_colour', $row['group_colour'], true); } + // Use default notifications settings if notifications_data is not set + if ($notifications_data === null) + { + $notifications_data = array( + array( + 'item_type' => 'notification.type.post', + 'method' => 'notification.method.email', + ), + array( + 'item_type' => 'notification.type.topic', + 'method' => 'notification.method.email', + ), + ); + } + // Subscribe user to notifications if necessary if (!empty($notifications_data)) { diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 3289273658..9a15967bae 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -314,24 +314,13 @@ class ucp_register 'user_inactive_time' => $user_inactive_time, ); - $user_notifications_data = array( - array( - 'item_type' => 'notification.type.post', - 'method' => 'notification.method.email', - ), - array( - 'item_type' => 'notification.type.topic', - 'method' => 'notification.method.email', - ), - ); - if ($config['new_member_post_limit']) { $user_row['user_new'] = 1; } // Register user... - $user_id = user_add($user_row, $cp_data, $user_notifications_data); + $user_id = user_add($user_row, $cp_data); // This should not happen, because the required variables are listed above... if ($user_id === false) |