diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-09-16 18:33:22 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-09-16 18:33:22 +0000 |
| commit | 2fa463cdeb5d8e4f2373aa834154ca27ea21c97a (patch) | |
| tree | 87059418d9b487f76bf1c99ae7ec3184a62cd8ef /phpBB/includes/ucp/ucp_profile.php | |
| parent | d80f8d577ebdc1489b2dcf49bdb9a266d29d1ef1 (diff) | |
| download | forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.tar forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.tar.gz forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.tar.bz2 forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.tar.xz forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.zip | |
- more updates, mostly bugfixes to the bbcode parser
- changed current_user in sessions (please review)
- give more flexibility to style authors in regard to the pagination elements
- profile fields updates (included a sample constuct into viewtopic_body.html - have to be documented extensivly)
- code optimizations (use of strpos, sizeof, loops not iterating functions on every call, memory savings...)
- and last but not least --- hopefully not introduced more bugs than healthy (*cough*)
git-svn-id: file:///svn/phpbb/trunk@4984 89ea8834-ac86-4346-8a33-228a782c2dd0
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; |