diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-28 14:53:59 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-28 14:53:59 -0700 |
| commit | ed94e3c5761cc188fc6e1e7943a888d30bd0e7b9 (patch) | |
| tree | d7027a4f3c4e20fd51f9505f3e874e28dcc96b66 /phpBB/includes | |
| parent | 0ffc3395c5d9a91d21530b5f431b0e6dcca1c88f (diff) | |
| parent | 616574d7ab15ea8c43a2c20d6871702d42c3696d (diff) | |
| download | forums-ed94e3c5761cc188fc6e1e7943a888d30bd0e7b9.tar forums-ed94e3c5761cc188fc6e1e7943a888d30bd0e7b9.tar.gz forums-ed94e3c5761cc188fc6e1e7943a888d30bd0e7b9.tar.bz2 forums-ed94e3c5761cc188fc6e1e7943a888d30bd0e7b9.tar.xz forums-ed94e3c5761cc188fc6e1e7943a888d30bd0e7b9.zip | |
Merge pull request #1784 from nickvergessen/ticket/11924
[Ticket/11924] Add a script to export the events in wiki format
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_zebra.php | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 258aabcc0d..029f4b23c9 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/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 diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ad5e3c05ce..510f46fcb4 100644 --- a/phpBB/includes/functions.php +++ b/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'); } diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php index 6bb3cdc145..090f9bf34c 100644 --- a/phpBB/includes/ucp/ucp_zebra.php +++ b/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 . ' |