diff options
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index e89ce7947f..f4e963daae 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -252,9 +252,14 @@ class ucp_profile extends module unset($data); // validate custom profile fields - $cp->submit_cp_field('profile', $cp_data, $cp_error); + $cp->submit_cp_field('profile', $user->get_iso_lang_id(), $cp_data, $cp_error); - if (!sizeof($error) && !sizeof($cp_error)) + if (sizeof($cp_error)) + { + $error = array_merge($error, $cp_error); + } + + if (!sizeof($error)) { $sql_ary = array( 'user_icq' => $icq, @@ -351,7 +356,7 @@ class ucp_profile extends module // Get additional profile fields and assign them to the template block var 'profile_fields' $user->get_profile_fields($user->data['user_id']); - $cp->generate_profile_fields('profile', $user->get_iso_lang_id(), $cp_error); + $cp->generate_profile_fields('profile', $user->get_iso_lang_id()); break; |