aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-12-15 16:23:48 -0600
committerNathan Guse <nathaniel.guse@gmail.com>2012-12-15 16:23:48 -0600
commit649e009f7b42a751d7b208bd5a4659c0fc442912 (patch)
treebbae2e34d9c2b34dce12b5c4a6705dfb0cd71008
parent175b6deb6d263a3184d4b51cb1f00137cadc542e (diff)
downloadforums-649e009f7b42a751d7b208bd5a4659c0fc442912.tar
forums-649e009f7b42a751d7b208bd5a4659c0fc442912.tar.gz
forums-649e009f7b42a751d7b208bd5a4659c0fc442912.tar.bz2
forums-649e009f7b42a751d7b208bd5a4659c0fc442912.tar.xz
forums-649e009f7b42a751d7b208bd5a4659c0fc442912.zip
[ticket/8610] Update comment
PHPBB3-8610
-rw-r--r--phpBB/includes/mcp/mcp_forum.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index de2966d34e..04e0e70f1d 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -422,7 +422,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
// Update the topic watch table.
phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
- // If the topic no longer exist, we will update the bookmarks table.
+ // Update the bookmarks table.
phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', $topic_ids, $to_topic_id);
// Link to the new topic