diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-12 00:54:51 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-12 00:54:51 +0200 |
| commit | 93fbc468fb16dab031ce93541a94dcc9c3956773 (patch) | |
| tree | 0a8acc2629c2311271b76e7414cbc935824dc816 /phpBB/phpbb | |
| parent | f73e60935de68da776969bf7719d3ee26179ec70 (diff) | |
| parent | f26b6b6251447eb66748ec14dea826b6887e81c0 (diff) | |
| download | forums-93fbc468fb16dab031ce93541a94dcc9c3956773.tar forums-93fbc468fb16dab031ce93541a94dcc9c3956773.tar.gz forums-93fbc468fb16dab031ce93541a94dcc9c3956773.tar.bz2 forums-93fbc468fb16dab031ce93541a94dcc9c3956773.tar.xz forums-93fbc468fb16dab031ce93541a94dcc9c3956773.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12734] Remove unnecessary error supressing
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/profilefields/manager.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php index 98802d2209..4ad3214ae4 100644 --- a/phpBB/phpbb/profilefields/manager.php +++ b/phpBB/phpbb/profilefields/manager.php @@ -245,12 +245,8 @@ class manager $cp_data = $this->build_insert_sql_array($cp_data); $cp_data['user_id'] = (int) $user_id; - $this->db->sql_return_on_error(true); - $sql = 'INSERT INTO ' . $this->fields_data_table . ' ' . $this->db->sql_build_array('INSERT', $cp_data); $this->db->sql_query($sql); - - $this->db->sql_return_on_error(false); } } @@ -328,7 +324,7 @@ class manager * Event to modify profile fields data retrieved from the database * * @event core.grab_profile_fields_data - * @var array user_ids Single user id or an array of ids + * @var array user_ids Single user id or an array of ids * @var array field_data Array with profile fields data * @since 3.1.0-b3 */ @@ -377,7 +373,7 @@ class manager * Event to modify data of the generated profile fields, before the template assignment loop * * @event core.generate_profile_fields_template_data_before - * @var array profile_row Array with users profile field data + * @var array profile_row Array with users profile field data * @var array tpl_fields Array with template data fields * @var bool use_contact_fields Should we display contact fields as such? * @since 3.1.0-b3 @@ -445,7 +441,7 @@ class manager * Event to modify template data of the generated profile fields * * @event core.generate_profile_fields_template_data - * @var array profile_row Array with users profile field data + * @var array profile_row Array with users profile field data * @var array tpl_fields Array with template data fields * @var bool use_contact_fields Should we display contact fields as such? * @since 3.1.0-b3 |