diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-08-24 10:04:15 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-08-24 10:04:15 +0000 |
| commit | 589db44b5695730678f41c8d5868c73d4726054e (patch) | |
| tree | 9c86ddde29aa3a0f07aa4d7109fff0df1c4e33d7 /phpBB/includes/functions_user.php | |
| parent | 8174462e895966ce18c336b60dda93e562f4096f (diff) | |
| download | forums-589db44b5695730678f41c8d5868c73d4726054e.tar forums-589db44b5695730678f41c8d5868c73d4726054e.tar.gz forums-589db44b5695730678f41c8d5868c73d4726054e.tar.bz2 forums-589db44b5695730678f41c8d5868c73d4726054e.tar.xz forums-589db44b5695730678f41c8d5868c73d4726054e.zip | |
Merge of the language-specific custom path change Revision #r8782
git-svn-id: file:///svn/phpbb/trunk@8786 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 3b376135ad..ee4fa3f805 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -147,7 +147,7 @@ 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 -* @return: the new user's ID. +* @return the new user's ID. */ function user_add($user_row, $cp_data = false) { @@ -2238,7 +2238,7 @@ function avatar_process_user(&$error, $custom_userdata = false) } } } - + $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . (($custom_userdata === false) ? $user->data['user_id'] : $custom_userdata['user_id']); @@ -3014,7 +3014,7 @@ function group_validate_groupname($group_id, $group_name) /** * Set users default group * -* @private +* @access private */ function group_set_user_default($group_id, $user_id_ary, $group_attributes = false, $update_listing = false) { |