diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2010-03-11 16:03:14 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2011-04-07 13:47:06 +0200 |
| commit | 27fdcb4c7ec4aac68ba0a809473312ee83b50a66 (patch) | |
| tree | c1cfbdb38e56d49c9b18c97c8560dac8caea4799 /phpBB/includes/mcp/mcp_main.php | |
| parent | 3352141264993982215b714ac7a128854494ac1f (diff) | |
| download | forums-27fdcb4c7ec4aac68ba0a809473312ee83b50a66.tar forums-27fdcb4c7ec4aac68ba0a809473312ee83b50a66.tar.gz forums-27fdcb4c7ec4aac68ba0a809473312ee83b50a66.tar.bz2 forums-27fdcb4c7ec4aac68ba0a809473312ee83b50a66.tar.xz forums-27fdcb4c7ec4aac68ba0a809473312ee83b50a66.zip | |
[ticket/9684] Remove code in some more files especially includes/
Topic-Tracking is still missing.
PHPBB3-9684
Diffstat (limited to 'phpBB/includes/mcp/mcp_main.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index b9964f48a7..212c8dcdaf 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -485,16 +485,13 @@ function mcp_move_topic($topic_ids) $topic_posts_added += $topic_info['topic_replies']; - if ($topic_info['topic_type'] != POST_GLOBAL) - { - $topics_removed++; - $topic_posts_removed += $topic_info['topic_replies']; + $topics_removed++; + $topic_posts_removed += $topic_info['topic_replies']; - if ($topic_info['topic_approved']) - { - $topics_authed_removed++; - $topic_posts_removed++; - } + if ($topic_info['topic_approved']) + { + $topics_authed_removed++; + $topic_posts_removed++; } } @@ -532,15 +529,6 @@ function mcp_move_topic($topic_ids) $forum_ids[] = $row['forum_id']; add_log('mod', $to_forum_id, $topic_id, 'LOG_MOVE', $row['forum_name'], $forum_data['forum_name']); - // If we have moved a global announcement, we need to correct the topic type - if ($row['topic_type'] == POST_GLOBAL) - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_type = ' . POST_ANNOUNCE . ' - WHERE topic_id = ' . (int) $row['topic_id']; - $db->sql_query($sql); - } - // Leave a redirection if required and only if the topic is visible to users if ($leave_shadow && $row['topic_approved'] && $row['topic_type'] != POST_GLOBAL) { |