diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 024fa612f0..bd7ed71dcb 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4762,9 +4762,10 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'A_COOKIE_SETTINGS'		=> addslashes('; path=' . $config['cookie_path'] . ((!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']) . ((!$config['cookie_secure']) ? '' : '; secure')),
 	));
 
-	$event = new phpbb_event_data();
-	$event->set_data(compact('page_title', 'display_online_list', 'item_id', 'item'));
+	$vars = array('page_title', 'display_online_list', 'item_id', 'item');
+	$event = new phpbb_event_data(compact($vars));
 	$phpbb_dispatcher->dispatch('core.page_header', $event);
+	extract($event->get_data_filtered($vars));
 
 	// application/xhtml+xml not used because of IE
 	header('Content-type: text/html; charset=UTF-8');