Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2017-02-22 11:09:30 +01:00
commit d956ac418d

View file

@ -272,13 +272,15 @@ function user_add($user_row, $cp_data = false, $notifications_data = null)
* Use this event to modify the values to be inserted when a user is added * Use this event to modify the values to be inserted when a user is added
* *
* @event core.user_add_modify_data * @event core.user_add_modify_data
* @var array user_row Array of user details submited to user_add * @var array user_row Array of user details submited to user_add
* @var array cp_data Array of Custom profile fields submited to user_add * @var array cp_data Array of Custom profile fields submited to user_add
* @var array sql_ary Array of data to be inserted when a user is added * @var array sql_ary Array of data to be inserted when a user is added
* @var array notifications_data Array of notification data to be inserted when a user is added
* @since 3.1.0-a1 * @since 3.1.0-a1
* @changed 3.1.0-b5 Added user_row and cp_data * @changed 3.1.0-b5 Added user_row and cp_data
* @changed 3.1.11-RC1 Added notifications_data
*/ */
$vars = array('user_row', 'cp_data', 'sql_ary'); $vars = array('user_row', 'cp_data', 'sql_ary', 'notifications_data');
extract($phpbb_dispatcher->trigger_event('core.user_add_modify_data', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.user_add_modify_data', compact($vars)));
$sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);