6 files changed, 15 insertions, 45 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 11843384ed..d86925dfab 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -108,9 +108,7 @@ class acp_forums
 					);
 
 					$vars = array('forum_data');
-					$event = new phpbb_event_data(compact($vars));
-					$phpbb_dispatcher->dispatch('core.acp_forums_add_forum_data', $event);
-					extract($event->get_data_filtered($vars));
+					extract($phpbb_dispatcher->trigger_event('core.acp_forums_add_forum_data', compact($vars), $vars));
 
 				// No break here
 
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 684729fc0d..507576b1d6 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -120,9 +120,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 	);
 
 	$vars = array('sql_ary');
-	$event = new phpbb_event_data(compact($vars));
-	$phpbb_dispatcher->dispatch('core.display_forums_sql_inject', $event);
-	extract($event->get_data_filtered($vars));
+	extract($phpbb_dispatcher->trigger_event('core.display_forums_sql_inject', compact($vars), $vars));
 
 	$sql = $db->sql_build_query('SELECT', $sql_ary);
 	$result = $db->sql_query($sql);
@@ -133,9 +131,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 	while ($row = $db->sql_fetchrow($result))
 	{
 		$vars = array('row');
-		$event = new phpbb_event_data(compact($vars));
-		$phpbb_dispatcher->dispatch('core.display_forums_row_inject', $event);
-		extract($event->get_data_filtered($vars));
+		extract($phpbb_dispatcher->trigger_event('core.display_forums_row_inject', compact($vars), $vars));
 
 		$forum_id = $row['forum_id'];
 
@@ -235,9 +231,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			$forum_rows[$parent_id]['orig_forum_last_post_time'] = $row['forum_last_post_time'];
 
 			$vars = array('forum_rows', 'parent_id', 'row');
-			$event = new phpbb_event_data(compact($vars));
-			$phpbb_dispatcher->dispatch('core.display_forums_row_values_inject', $event);
-			extract($event->get_data_filtered($vars));
+			extract($phpbb_dispatcher->trigger_event('core.display_forums_row_values_inject', compact($vars), $vars));
 		}
 		else if ($row['forum_type'] != FORUM_CAT)
 		{
@@ -499,9 +493,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		);
 
 		$vars = array('row');
-		$event = new phpbb_event_data(compact($vars));
-		$phpbb_dispatcher->dispatch('core.display_forums_assign_block_vars', $event);
-		extract($event->get_data_filtered($vars));
+		extract($phpbb_dispatcher->trigger_event('core.display_forums_assign_block_vars', compact($vars), $vars));
 
 		// Assign subforums loop for style authors
 		foreach ($subforums_list as $subforum)
@@ -879,9 +871,7 @@ function display_custom_bbcodes()
 		);
 
 		$vars = array('custom_tags', 'row');
-		$event = new phpbb_event_data(compact($vars));
-		$phpbb_dispatcher->dispatch('core.display_custom_bbcodes_row', $event);
-		extract($event->get_data_filtered($vars));
+		extract($phpbb_dispatcher->trigger_event('core.display_custom_bbcodes_row', compact($vars), $vars));
 
 		$template->assign_block_vars('custom_tags', $custom_tags);
 
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index d3550aafba..6c7cb3f0b2 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -132,9 +132,7 @@ function generate_smilies($mode, $forum_id)
 	}
 
 	$vars = array('mode', 'forum_id', 'display_link');
-	$event = new phpbb_event_data(compact($vars));
-	$phpbb_dispatcher->dispatch('core.generate_smilies_footer', $event);
-	extract($event->get_data_filtered($vars));
+	extract($phpbb_dispatcher->trigger_event('core.generate_smilies_footer', compact($vars), $vars));
 
 	if ($mode == 'window')
 	{
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 82400de932..761ce6436a 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -138,9 +138,7 @@ function user_update_name($old_name, $new_name)
 	}
 
 	$vars = array('old_name', 'new_name');
-	$event = new phpbb_event_data(compact($vars));
-	$phpbb_dispatcher->dispatch('core.user_update_name', $event);
-	extract($event->get_data_filtered($vars));
+	extract($phpbb_dispatcher->trigger_event('core.user_update_name', compact($vars), $vars));
 
 	// Because some tables/caches use username-specific data we need to purge this here.
 	$cache->destroy('sql', MODERATOR_CACHE_TABLE);
@@ -541,9 +539,7 @@ function user_delete($mode, $user_id, $post_username = false)
 	$db->sql_transaction('commit');
 
 	$vars = array('mode', 'user_id', 'post_username');
-	$event = new phpbb_event_data(compact($vars));
-	$phpbb_dispatcher->dispatch('core.user_delete', $event);
-	extract($event->get_data_filtered($vars));
+	extract($phpbb_dispatcher->trigger_event('core.user_delete', compact($vars), $vars));
 
 	// Reset newest user info if appropriate
 	if ($config['newest_user_id'] == $user_id)
@@ -2819,9 +2815,7 @@ function group_delete($group_id, $group_name = false)
 	unset($teampage);
 
 	$vars = array('group_id', 'group_name');
-	$event = new phpbb_event_data(compact($vars));
-	$phpbb_dispatcher->dispatch('core.group_delete', $event);
-	extract($event->get_data_filtered($vars));
+	extract($phpbb_dispatcher->trigger_event('core.group_delete', compact($vars), $vars));
 
 	// Delete group
 	$sql = 'DELETE FROM ' . GROUPS_TABLE . "
@@ -3055,9 +3049,7 @@ function group_user_del($group_id, $user_id_ary = false, $username_ary = false,
 	unset($special_group_data);
 
 	$vars = array('group_id', 'user_id_ary', 'username_ary', 'group_name');
-	$event = new phpbb_event_data(compact($vars));
-	$phpbb_dispatcher->dispatch('core.group_user_del', $event);
-	extract($event->get_data_filtered($vars));
+	extract($phpbb_dispatcher->trigger_event('core.group_user_del', compact($vars), $vars));
 
 	$sql = 'DELETE FROM ' . USER_GROUP_TABLE . "
 		WHERE group_id = $group_id
@@ -3473,9 +3465,7 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal
 	}
 
 	$vars = array('group_id', 'user_id_ary', 'group_attributes', 'update_listing', 'sql_ary');
-	$event = new phpbb_event_data(compact($vars));
-	$phpbb_dispatcher->dispatch('core.group_set_user_default', $event);
-	extract($event->get_data_filtered($vars));
+	extract($phpbb_dispatcher->trigger_event('core.group_set_user_default', compact($vars), $vars));
 
 	if ($update_listing)
 	{
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index caaecfb741..a381521813 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -269,9 +269,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	);
 
 	$vars = array('id', 'mode', 'folder_id', 'msg_id', 'folder', 'message_row', 'cp_row');
-	$event = new phpbb_event_data(compact($vars));
-	$phpbb_dispatcher->dispatch('core.ucp_pm_viewmesssage', $event);
-	extract($event->get_data_filtered($vars));
+	extract($phpbb_dispatcher->trigger_event('core.ucp_pm_viewmesssage', compact($vars), $vars));
 
 	// Display the custom profile fields
 	if (!empty($cp_row['row']))
diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php
index f8012fdcdf..a2eb5dbdaa 100644
--- a/phpBB/includes/ucp/ucp_zebra.php
+++ b/phpBB/includes/ucp/ucp_zebra.php
@@ -55,9 +55,7 @@ class ucp_zebra
 					if (!empty($data['usernames']))
 					{
 						$vars = array('data');
-						$event = new phpbb_event_data(compact($vars));
-						$phpbb_dispatcher->dispatch('core.ucp_zebra_remove', $event);
-						extract($event->get_data_filtered($vars));
+						extract($phpbb_dispatcher->trigger_event('core.ucp_zebra_remove', compact($vars), $vars));
 
 						$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
 							WHERE user_id = ' . $user->data['user_id'] . '
@@ -192,9 +190,7 @@ class ucp_zebra
 									}
 
 									$vars = array('mode', 'sql_ary');
-									$event = new phpbb_event_data(compact($vars));
-									$phpbb_dispatcher->dispatch('core.ucp_zebra_add', $event);
-									extract($event->get_data_filtered($vars));
+									extract($phpbb_dispatcher->trigger_event('core.ucp_zebra_add', compact($vars), $vars));
 
 									$db->sql_multi_insert(ZEBRA_TABLE, $sql_ary);