diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-10-28 19:50:01 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-10-28 19:50:01 +0100 |
| commit | 40a69b8edf54101537ac037d43da3cfe4f41c616 (patch) | |
| tree | b494434e486b25810dc898175d8aab374c39feea | |
| parent | 0e8e8c7b145c33d6e76594eec1fe38d52a07ecde (diff) | |
| parent | 1b20430399c19069e197146cbca081ec868c1282 (diff) | |
| download | forums-40a69b8edf54101537ac037d43da3cfe4f41c616.tar forums-40a69b8edf54101537ac037d43da3cfe4f41c616.tar.gz forums-40a69b8edf54101537ac037d43da3cfe4f41c616.tar.bz2 forums-40a69b8edf54101537ac037d43da3cfe4f41c616.tar.xz forums-40a69b8edf54101537ac037d43da3cfe4f41c616.zip | |
Merge branch '3.2.x' into 3.3.x
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 9044cd0e97..8f55f64da0 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -1423,8 +1423,8 @@ class acp_forums * This event may be triggered, when a forum is deleted * * @event core.acp_manage_forums_move_children - * @var int from_id If of the current parent forum - * @var int to_id If of the new parent forum + * @var int from_id Id of the current parent forum + * @var int to_id Id of the new parent forum * @var array errors Array of errors, should be strings and not * language key. * @since 3.1.0-a1 @@ -1529,8 +1529,8 @@ class acp_forums * Event when we move content from one forum to another * * @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 int from_id Id of the current parent forum + * @var int to_id Id of the new parent forum * @var bool sync Shall we sync the "to"-forum's data * @var array errors Array of errors, should be strings and not * language key. If this array is not empty, @@ -1576,6 +1576,19 @@ class acp_forums $db->sql_query($sql); } + /** + * Event when content has been moved from one forum to another + * + * @event core.acp_manage_forums_move_content_after + * @var int from_id Id of the current parent forum + * @var int to_id Id of the new parent forum + * @var bool sync Shall we sync the "to"-forum's data + * + * @since 3.2.9-RC1 + */ + $vars = array('from_id', 'to_id', 'sync'); + extract($phpbb_dispatcher->trigger_event('core.acp_manage_forums_move_content_after', compact($vars))); + if ($sync) { // Delete ghost topics that link back to the same forum then resync counters |