3 files changed, 42 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index f3b59186a6..51018e3a5d 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -90,6 +90,32 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 	// we include the language file here
 	$user->add_lang('viewtopic');
 
+	/**
+	* Modify the default vars before composing a PM
+	*
+	* @event core.ucp_pm_compose_modify_data
+	* @var	int		msg_id					post_id in the page request
+	* @var	int		to_user_id				The id of whom the message is to
+	* @var	int		to_group_id				The id of the group the message is to
+	* @var	bool	submit					Whether the form has been submitted
+	* @var	bool	preview					Whether the user is previewing the PM or not
+	* @var	string	action					One of: post, reply, quote, forward, quotepost, edit, delete, smilies
+	* @var	bool	delete					Whether the user is deleting the PM
+	* @var	int		reply_to_all			Value of reply_to_all request variable.
+	* @since 3.1.4-RC1
+	*/
+	$vars = array(
+		'msg_id',
+		'to_user_id',
+		'to_group_id',
+		'submit',
+		'preview',
+		'action',
+		'delete',
+		'reply_to_all',
+	);
+	extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_data', compact($vars)));
+
 	// Output PM_TO box if message composing
 	if ($action != 'edit')
 	{
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 1d3fb19f67..3c274b53c7 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -69,7 +69,7 @@ class ucp_prefs
 				* @var	array	data		Array with current ucp options data
 				* @var	array	error		Array with list of errors
 				* @since 3.1.0-a1
-				* @changed 3.1.4-rc1 Added error variable to the event
+				* @changed 3.1.4-RC1 Added error variable to the event
 				*/
 				$vars = array('submit', 'data', 'error');
 				extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_personal_data', compact($vars)));
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 2c786a1d39..8d8d42e742 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -115,16 +115,16 @@ class ucp_profile
 					}
 
 					/**
-					* Validate user data on editing profile in UCP
+					* Validate user data on editing registration data in UCP
 					*
-					* @event core.ucp_profile_info_validate_data
+					* @event core.ucp_profile_reg_details_validate
 					* @var	array	data			Array with user profile data
 					* @var	bool	submit			Flag indicating if submit button has been pressed
 					* @var array	error			Array of any generated errors
 					* @since 3.1.4-RC1
 					*/
 					$vars = array('data', 'submit', 'error');
-					extract($phpbb_dispatcher->trigger_event('core.ucp_profile_info_validate_data', compact($vars)));
+					extract($phpbb_dispatcher->trigger_event('core.ucp_profile_reg_details_validate', compact($vars)));
 
 					if (!sizeof($error))
 					{
@@ -365,6 +365,18 @@ class ucp_profile
 						$error[] = 'FORM_INVALID';
 					}
 
+					/**
+					* Validate user data on editing profile in UCP
+					*
+					* @event core.ucp_profile_validate_profile_info
+					* @var	array	data			Array with user profile data
+					* @var	bool	submit			Flag indicating if submit button has been pressed
+					* @var array	error			Array of any generated errors
+					* @since 3.1.4-RC1
+					*/
+					$vars = array('data', 'submit', 'error');
+					extract($phpbb_dispatcher->trigger_event('core.ucp_profile_validate_profile_info', compact($vars)));
+
 					if (!sizeof($error))
 					{
 						$data['notify'] = $user->data['user_notify_type'];