diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 638b94c220..df55c4540c 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1497,7 +1497,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	* @var	bool	update_search_index	Flag indicating if the search index will be updated
 	* @since 3.1.0-a4
 	*/
-	extract($phpbb_dispatcher->trigger_event('core.modify_submit_post_data', compact(array('mode', 'subject', 'username', 'topic_type', 'poll', 'data', 'update_message', 'update_search_index'))));
+	$vars = array('mode', 'subject', 'username', 'topic_type', 'poll', 'data', 'update_message', 'update_search_index');
+	extract($phpbb_dispatcher->trigger_event('core.modify_submit_post_data', compact($vars)));
 
 	// We do not handle erasing posts here
 	if ($mode == 'delete')
diff --git a/phpBB/mcp.php b/phpBB/mcp.php
index 1449346deb..5676c399af 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -197,7 +197,8 @@ if ($quickmod)
 			* @var	bool	is_valid_action	Flag indicating if the action was handled properly
 			* @since 3.1.0-a4
 			*/
-			extract($phpbb_dispatcher->trigger_event('core.modify_quickmod_options', compact(array('module', 'action', 'is_valid_action'))));
+			$vars = array('module', 'action', 'is_valid_action');
+			extract($phpbb_dispatcher->trigger_event('core.modify_quickmod_options', compact($vars)));
 
 			if (!$is_valid_action)
 			{