aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php4
-rw-r--r--phpBB/includes/ucp/ucp_zebra.php8
2 files changed, 3 insertions, 9 deletions
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);