aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/ucp/ucp_profile.php21
-rw-r--r--phpBB/includes/ucp/ucp_register.php9
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';