mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Marc Alexander 2015-03-07 21:23:59 +01:00
commit 3a4e1ce215
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
phpBB/includes/functions_admin.php
View File

@ -618,7 +618,7 @@ function move_posts($post_ids, $topic_id, $auto_sync = true)
*/
function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_sync = true, $call_delete_posts = true)
{
global $db, $config, $phpbb_container;
global $db, $config, $phpbb_container, $phpbb_dispatcher;
$approved_topics = 0;
$forum_ids = $topic_ids = array();
@ -672,6 +672,20 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
$table_ary = array(BOOKMARKS_TABLE, TOPICS_TRACK_TABLE, TOPICS_POSTED_TABLE, POLL_VOTES_TABLE, POLL_OPTIONS_TABLE, TOPICS_WATCH_TABLE, TOPICS_TABLE);
/**
* Perform additional actions before topic(s) deletion
*
* @event core.delete_topics_before_query
* @var array table_ary Array of tables from which all rows will be deleted that hold a topic_id occuring in topic_ids
* @var array topic_ids Array of topic ids to delete
* @since 3.1.4-RC1
*/
$vars = array(
'table_ary',
'topic_ids',
);
extract($phpbb_dispatcher->trigger_event('core.delete_topics_before_query', compact($vars)));
foreach ($table_ary as $table)
{
$sql = "DELETE FROM $table
@ -680,6 +694,18 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
}
unset($table_ary);
/**
* Perform additional actions after topic(s) deletion
*
* @event core.delete_topics_after_query
* @var array topic_ids Array of topic ids that were deleted
* @since 3.1.4-RC1
*/
$vars = array(
'topic_ids',
);
extract($phpbb_dispatcher->trigger_event('core.delete_topics_after_query', compact($vars)));
$moved_topic_ids = array();
// update the other forums