mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 09:16:55 +02:00
Code Issues Releases Wiki Activity

[ticket/8610] Use phpbb_update_rows_avoiding_duplicates

Browse Source 
PHPBB3-8610
This commit is contained in:
Nathan Guse
2012-12-13 20:42:10 -06:00
parent 5c614ff624
commit a50907250e
2 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/mcp/mcp_topic.php
View File

@@ -671,17 +671,7 @@ function merge_posts($topic_id, $to_topic_id)
$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE topic_id = ' . (int) $topic_id);
// If the topic no longer exist, we will update the bookmarks table.
// To not let it error out on users who bookmarked both topics, we just return on an error...
$db->sql_return_on_error(true);
$sql = 'UPDATE ' . BOOKMARKS_TABLE . '
SET topic_id = ' . (int) $to_topic_id . '
WHERE topic_id = ' . (int) $topic_id;
$db->sql_query($sql);
$db->sql_return_on_error(false);
$sql = 'DELETE FROM ' . BOOKMARKS_TABLE . '
WHERE topic_id = ' . (int) $topic_id;
$db->sql_query($sql);
phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', $topic_id, $to_topic_id);
}
// Link to the new topic