diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:41 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:41 +0100 |
| commit | 6ebc26e330d5e204eab0ac9061bb5817534047fe (patch) | |
| tree | 417aa508a0b4282ec0ae1834ea02032e7e033d5f /phpBB/includes/mcp/mcp_forum.php | |
| parent | f0eb18fffd11a97383c8ccf2ae7d2838939f09e2 (diff) | |
| parent | 8d12b40fc4fdf50517e9584d14a5edd311953e7c (diff) | |
| download | forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.tar forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.tar.gz forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.tar.bz2 forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.tar.xz forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.zip | |
Merge commit 'release-3.0.6-RC3'
Diffstat (limited to 'phpBB/includes/mcp/mcp_forum.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index acb7aa4ac0..b70601b479 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -416,14 +416,11 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) // If the topic no longer exist, we will update the topic watch table. // To not let it error out on users watching both topics, we just return on an error... - // Same for Bookmarks $db->sql_return_on_error(true); $db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); - $db->sql_query('UPDATE ' . BOOKMARKS_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); $db->sql_return_on_error(false); $db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); - $db->sql_query('DELETE FROM ' . BOOKMARKS_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); // 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>'); |