aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-09-12 00:54:51 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-09-12 00:54:51 +0200
commitf26b6b6251447eb66748ec14dea826b6887e81c0 (patch)
treed555ae60a7720103d02f9843e6f7befb52dc407f
parentf892646a8451d5ecf93d6edce55b17e4620acb18 (diff)
parentfcd2a2f186641f0c11abc40e196e6d916c87646c (diff)
downloadforums-f26b6b6251447eb66748ec14dea826b6887e81c0.tar
forums-f26b6b6251447eb66748ec14dea826b6887e81c0.tar.gz
forums-f26b6b6251447eb66748ec14dea826b6887e81c0.tar.bz2
forums-f26b6b6251447eb66748ec14dea826b6887e81c0.tar.xz
forums-f26b6b6251447eb66748ec14dea826b6887e81c0.zip
Merge pull request #2941 from Senky/ticket/12734
[ticket/12734] Custom profile manager should not suppress errors when inserting user rows * Senky/ticket/12734: [ticket/12734] Remove unnecessary error supressing
-rw-r--r--phpBB/phpbb/profilefields/manager.php10
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