From aa6c728e6fea34142008a2c62cfd508cf4026824 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Sun, 7 Sep 2008 17:10:43 +0000 Subject: [PATCH] Do not decrease topics counter when deleting shadow topics. #26495 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8836 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/functions_admin.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f0770e7fee..fdddd29895 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -118,6 +118,7 @@
  • [Fix] Do not show non indexed forums on the search page if they contain no subforums. (Bug #33125)
  • [Fix] Stop search bots incrementing topic views. (Bug #32675 - Patch by eviL<3)
  • [Fix] Use correct link for post author search. (Bug #32595)
    • +
  • [Fix] Do not decrease topics counter when deleting shadow topics. (Bug #26495)
    • diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 9e89926e1a..0f5f10265f 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -551,7 +551,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s '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, topic_moved_id FROM ' . TOPICS_TABLE . ' WHERE ' . $where_clause; $result = $db->sql_query($sql); @@ -561,7 +561,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s $forum_ids[] = $row['forum_id']; $topic_ids[] = $row['topic_id']; - if ($row['topic_approved']) + if ($row['topic_approved'] && !$row['topic_moved_id']) { $approved_topics++; }