diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-16 16:48:15 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-16 16:48:15 -0500 |
| commit | da2f0757d777e3b7d34ac65884400ce276d99c9a (patch) | |
| tree | 094cf50a5c803bf5b79aeaf57afa80873820a773 /phpBB/includes/mcp/mcp_forum.php | |
| parent | 0f35f94398dbb8b64d420dc8ebcdea760cade113 (diff) | |
| parent | a288c4b66bdd82de70ff14750890e9829fa7d9b9 (diff) | |
| download | forums-da2f0757d777e3b7d34ac65884400ce276d99c9a.tar forums-da2f0757d777e3b7d34ac65884400ce276d99c9a.tar.gz forums-da2f0757d777e3b7d34ac65884400ce276d99c9a.tar.bz2 forums-da2f0757d777e3b7d34ac65884400ce276d99c9a.tar.xz forums-da2f0757d777e3b7d34ac65884400ce276d99c9a.zip | |
Merge PR #1140 branch 'develop-olympus' into develop
* develop-olympus:
[ticket/8610] Update comment
[ticket/8610] Do not use requests to submit posts except in posting_test.php
[ticket/8610] Move posting helpers to separate file
[ticket/8610] Create helper functions to create topic/post in functional tests
[ticket/8610] Use phpbb_update_rows_avoiding_duplicates
[ticket/8610] Revert some funky merging I did from rebase
[ticket/8610] Add some comments
[ticket/8610] Update Bookmarks and Subscriptions when splitting topics
[ticket/8610] Update Bookmarks when merging posts into another topic
[ticket/8610] Update Bookmarks when forking topics
[ticket/8610] Update Bookmarks when merging topics
Diffstat (limited to 'phpBB/includes/mcp/mcp_forum.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 4ef4b75855..0fad9e2a22 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -430,13 +430,17 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) // Message and return links $success_msg = 'POSTS_MERGED_SUCCESS'; - // Update the topic watch table. if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status')) { include($phpbb_root_path . 'includes/functions_database_helper.' . $phpEx); } + + // Update the topic watch table. phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id); + // Update the bookmarks table. + phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', $topic_ids, $to_topic_id); + // Link to the new topic $return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&t=' . $to_topic_id) . '">', '</a>'); } |