From 165c5f8f15c969c10f0ae5b2c1a0bc68947ce595 Mon Sep 17 00:00:00 2001
From: Stanislav Atanasov <lucifer@anavaro.com>
Date: Sat, 14 Jun 2014 11:47:41 +0300
Subject: [PATCH] [ticket/12701] Rmove before event and expand modify_data

Removing core.user_add_before
Adding $user_row and $cp_data to core.user_add_modify_data

PHPBB3-12701
---
 phpBB/includes/functions_user.php | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 0990eacc1c..b1e1742ef8 100755
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -180,17 +180,6 @@ function user_add($user_row, $cp_data = false)
 		return false;
 	}
 
-	/**
-	* Event to parse/modify data submited to user_add function
-	*
-	* @event core.user_add_before
-	* @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
-	* @since 3.1.0-b5
-	*/
-	$vars = array('user_row', 'cp_data');
-	extract($phpbb_dispatcher->trigger_event('core.user_add_before', compact($vars)));
-
 	$sql_ary = array(
 		'username'			=> $user_row['username'],
 		'username_clean'	=> $username_clean,
@@ -272,10 +261,12 @@ function user_add($user_row, $cp_data = false)
 	* Use this event to modify the values to be inserted when a user is added
 	*
 	* @event core.user_add_modify_data
+	* @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	sql_ary		Array of data to be inserted when a user is added
-	* @since 3.1.0-a1
+	* @since 3.1.0-b5
 	*/
-	$vars = array('sql_ary');
+	$vars = array('user_row', 'cp_data', 'sql_ary');
 	extract($phpbb_dispatcher->trigger_event('core.user_add_modify_data', compact($vars)));
 
 	$sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);