diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-01-12 13:13:00 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-01-12 13:13:00 +0000 |
| commit | 41e56c8fa62c96fbbbcf4520ed3fe62a22c97e41 (patch) | |
| tree | d26a1db363ed9539b3de8f62b7b231922b6908ec | |
| parent | 7a7cbc14fff0687f5e74f7f7d72a4c3d39a72259 (diff) | |
| download | forums-41e56c8fa62c96fbbbcf4520ed3fe62a22c97e41.tar forums-41e56c8fa62c96fbbbcf4520ed3fe62a22c97e41.tar.gz forums-41e56c8fa62c96fbbbcf4520ed3fe62a22c97e41.tar.bz2 forums-41e56c8fa62c96fbbbcf4520ed3fe62a22c97e41.tar.xz forums-41e56c8fa62c96fbbbcf4520ed3fe62a22c97e41.zip | |
do not end up with an error if no profile fields defined...
git-svn-id: file:///svn/phpbb/trunk@4755 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 21 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 9 |
2 files changed, 18 insertions, 12 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index e1d0921c1b..6cff7474c8 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -268,16 +268,19 @@ class ucp_profile extends module $db->sql_query($sql); // Update Custom Fields - $sql = 'UPDATE phpbb_profile_fields_data - SET ' . $db->sql_build_array('UPDATE', $cp_data) . ' - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - if (!$db->sql_affectedrows()) + if (sizeof($cp_data)) { - $db->return_on_error = true; - $cp_data['user_id'] = (int) $user->data['user_id']; - $db->sql_query('INSERT INTO phpbb_profile_fields_data ' . $db->sql_build_array('INSERT', $cp_data)); - $db->return_on_error = false; + $sql = 'UPDATE phpbb_profile_fields_data + SET ' . $db->sql_build_array('UPDATE', $cp_data) . ' + WHERE user_id = ' . $user->data['user_id']; + $db->sql_query($sql); + if (!$db->sql_affectedrows()) + { + $db->return_on_error = true; + $cp_data['user_id'] = (int) $user->data['user_id']; + $db->sql_query('INSERT INTO phpbb_profile_fields_data ' . $db->sql_build_array('INSERT', $cp_data)); + $db->return_on_error = false; + } } meta_refresh(3, "ucp.$phpEx$SID&i=$id&mode=$mode"); diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 5f51a67a8c..e01ed39812 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -190,9 +190,12 @@ class ucp_register extends module $user_id = $db->sql_nextid(); // Insert Custom Profile Fields - $cp_data['user_id'] = (int) $user_id; - $sql = 'INSERT INTO phpbb_profile_fields_data ' . $db->sql_build_array('INSERT', $cp->build_insert_sql_array($cp_data)); - $db->sql_query($sql); + if (sizeof($cp_data)) + { + $cp_data['user_id'] = (int) $user_id; + $sql = 'INSERT INTO phpbb_profile_fields_data ' . $db->sql_build_array('INSERT', $cp->build_insert_sql_array($cp_data)); + $db->sql_query($sql); + } // Place into appropriate group, either REGISTERED(_COPPA) or INACTIVE(_COPPA) depending on config $group_reg = ($coppa) ? 'REGISTERED_COPPA' : 'REGISTERED'; |