makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2019-10-28 19:50:06 +01:00
commit 885fca6a20
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/includes/acp/acp_forums.php
View file

@ -1423,8 +1423,8 @@ class acp_forums
* This event may be triggered, when a forum is deleted * This event may be triggered, when a forum is deleted
* *
* @event core.acp_manage_forums_move_children * @event core.acp_manage_forums_move_children
* @var int from_id If of the current parent forum * @var int from_id Id of the current parent forum
* @var int to_id If of the new parent forum * @var int to_id Id of the new parent forum
* @var array errors Array of errors, should be strings and not * @var array errors Array of errors, should be strings and not
* language key. * language key.
* @since 3.1.0-a1 * @since 3.1.0-a1
@ -1529,8 +1529,8 @@ class acp_forums
* Event when we move content from one forum to another * Event when we move content from one forum to another
* *
* @event core.acp_manage_forums_move_content * @event core.acp_manage_forums_move_content
* @var int from_id If of the current parent forum * @var int from_id Id of the current parent forum
* @var int to_id If of the new parent forum * @var int to_id Id of the new parent forum
* @var bool sync Shall we sync the "to"-forum's data * @var bool sync Shall we sync the "to"-forum's data
* @var array errors Array of errors, should be strings and not * @var array errors Array of errors, should be strings and not
* language key. If this array is not empty, * language key. If this array is not empty,
@ -1576,6 +1576,19 @@ class acp_forums
$db->sql_query($sql); $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) if ($sync)
{ {
// Delete ghost topics that link back to the same forum then resync counters // Delete ghost topics that link back to the same forum then resync counters