diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index f31a657687..86a2d14315 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5076,6 +5076,7 @@ function page_footer($run_cron = true)
 
 	$vars = array('run_cron', 'page_footer_override');
 	extract($phpbb_dispatcher->trigger_event('core.page_footer_override', compact($vars)));
+
 	if ($page_footer_override)
 	{
 		return;
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index d40b8b5279..a43e896b07 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -289,9 +289,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 		}
 
 		$vars = array('topic_row', 'row');
-		$event = new phpbb_event_data(compact($vars));
-		$phpbb_dispatcher->dispatch('core.mcp_forum_topicrow', $event);
-		extract($event->get_data_filtered($vars));
+		extract($phpbb_dispatcher->trigger_event('core.mcp_forum_topicrow', compact($vars)));
 
 		$template->assign_block_vars('topicrow', $topic_row);
 	}