diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-08-19 10:09:32 -0500 |
|---|---|---|
| committer | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-08-19 10:09:32 -0500 |
| commit | 68744484c839de8529483d588af818e703c31888 (patch) | |
| tree | 635160c985493b20b0f8f34377697666b7a7131f /phpBB/includes/acp/acp_forums.php | |
| parent | 25c579c00d25356afead09f13031e69e22f91324 (diff) | |
| parent | 38fc35a497e375797afdce6bc3cba952b9ed5344 (diff) | |
| download | forums-68744484c839de8529483d588af818e703c31888.tar forums-68744484c839de8529483d588af818e703c31888.tar.gz forums-68744484c839de8529483d588af818e703c31888.tar.bz2 forums-68744484c839de8529483d588af818e703c31888.tar.xz forums-68744484c839de8529483d588af818e703c31888.zip | |
Merge branch 'ticket/bantu/9167' into develop-olympus
* ticket/bantu/9167:
[ticket/9167] Detect and remove any dead left over shadow topics on update.
[ticket/9167] Remove shadow topics from remaining forums when deleting a forum
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index f2f1bd80e2..4d9b9f01e0 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -1642,6 +1642,9 @@ class acp_forums delete_attachments('topic', $topic_ids, false); + // Delete shadow topics pointing to topics in this forum + delete_topic_shadows($forum_id); + // Before we remove anything we make sure we are able to adjust the post counts later. ;) $sql = 'SELECT poster_id FROM ' . POSTS_TABLE . ' |