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

#5181

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7221 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-03-23 17:59:26 +00:00
parent 41a532e608
commit 2e244a1eeb
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/includes/functions_admin.php
View file

@ -495,7 +495,7 @@ function move_posts($post_ids, $topic_id, $auto_sync = true)
/** /**
* Remove topic(s) * Remove topic(s)
*/ */
function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_sync = true) function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_sync = true, $call_delete_posts = true)
{ {
global $db, $config; global $db, $config;
@ -518,8 +518,9 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
$where_clause = $db->sql_in_set($where_type, $where_ids); $where_clause = $db->sql_in_set($where_type, $where_ids);
} }
// Making sure that delete_posts does not call delete_topics again...
$return = array( $return = array(
'posts' => delete_posts($where_type, $where_ids, false, true, $post_count_sync) 'posts' => ($call_delete_posts) ? delete_posts($where_type, $where_ids, false, true, $post_count_sync, false) : 0,
); );
$sql = 'SELECT topic_id, forum_id, topic_approved $sql = 'SELECT topic_id, forum_id, topic_approved
@ -581,7 +582,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
/** /**
* Remove post(s) * Remove post(s)
*/ */
function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync = true, $post_count_sync = true) function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync = true, $post_count_sync = true, $call_delete_topics = true)
{ {
global $db, $config, $phpbb_root_path, $phpEx; global $db, $config, $phpbb_root_path, $phpEx;
@ -726,9 +727,9 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
} }
// We actually remove topics now to not be inconsistent (the delete_topics function calls this function too) // We actually remove topics now to not be inconsistent (the delete_topics function calls this function too)
if (sizeof($remove_topics)) if (sizeof($remove_topics) && $call_delete_topics)
{ {
delete_topics('topic_id', $remove_topics, $auto_sync, $post_count_sync); delete_topics('topic_id', $remove_topics, $auto_sync, $post_count_sync, false);
} }
return sizeof($post_ids); return sizeof($post_ids);