Merge pull request #1784 from nickvergessen/ticket/11924

[Ticket/11924] Add a script to export the events in wiki format

phpBB/includes/acp/acp_forums.php

@@ -1470,7 +1470,7 @@ class acp_forums
 		/**
 		* Event when we move content from one forum to another
 		*
-		* @event core.acp_manage_forums_move_children
+		* @event core.acp_manage_forums_move_content
 		* @var	int		from_id		If of the current parent forum
 		* @var	int		to_id		If of the new parent forum
 		* @var	bool	sync		Shall we sync the "to"-forum's data

phpBB/includes/functions.php

@@ -5597,14 +5597,14 @@ function garbage_collection()
 	global $cache, $db;
 	global $phpbb_dispatcher;
 
-	/**
-	* Unload some objects, to free some memory, before we finish our task
-	*
-	* @event core.garbage_collection
-	* @since 3.1-A1
-	*/
 	if (!empty($phpbb_dispatcher))
 	{
+		/**
+		* Unload some objects, to free some memory, before we finish our task
+		*
+		* @event core.garbage_collection
+		* @since 3.1-A1
+		*/
 		$phpbb_dispatcher->dispatch('core.garbage_collection');
 	}
 

phpBB/includes/ucp/ucp_zebra.php

@@ -64,7 +64,7 @@ class ucp_zebra
 						* @var	array	user_ids	User ids we remove
 						* @since 3.1-A1
 						*/
-						$vars = array('user_ids');
+						$vars = array('mode', 'user_ids');
 						extract($phpbb_dispatcher->trigger_event('core.ucp_remove_zebra', compact($vars)));
 
 						$sql = 'DELETE FROM ' . ZEBRA_TABLE . '