diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-02-14 12:38:06 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-02-14 12:38:06 +0000 |
| commit | 95f11a38c0e5d4e1a84826e809d922e011cd3fa6 (patch) | |
| tree | 20d1dffb34f7ccb98ba9696385022b9236157652 | |
| parent | 65ba4fe94e983bb02d61357470141e959d6412b2 (diff) | |
| download | forums-95f11a38c0e5d4e1a84826e809d922e011cd3fa6.tar forums-95f11a38c0e5d4e1a84826e809d922e011cd3fa6.tar.gz forums-95f11a38c0e5d4e1a84826e809d922e011cd3fa6.tar.bz2 forums-95f11a38c0e5d4e1a84826e809d922e011cd3fa6.tar.xz forums-95f11a38c0e5d4e1a84826e809d922e011cd3fa6.zip | |
Cross ci, converter not updated. (as 3.1 schema won't fit any more)
git-svn-id: file:///svn/phpbb/trunk@8383 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 8257f8a48e..eb4eb77f22 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -173,7 +173,7 @@ define('FIELD_DATE', 6); // Additional constants -define('VOTE_CONVERTED', 9999); +define('VOTE_CONVERTED', 127); // Table names define('ACL_GROUPS_TABLE', $table_prefix . 'acl_groups'); diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index a0aa0291ad..ded50fe0c0 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -143,7 +143,11 @@ function user_update_name($old_name, $new_name) } /** -* Add User +* Adds an user +* +* @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. */ function user_add($user_row, $cp_data = false) { @@ -281,7 +285,7 @@ function user_add($user_row, $cp_data = false) $sql = 'SELECT group_colour FROM ' . GROUPS_TABLE . ' - WHERE group_id = ' . $user_row['group_id']; + WHERE group_id = ' . (int) $user_row['group_id']; $result = $db->sql_query_limit($sql, 1); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); |