diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-08-08 13:42:51 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-08-08 13:42:51 +0200 |
| commit | 91eccc708bb0ca4143ad670be6ecddef818b9316 (patch) | |
| tree | 6f8d1548ca404ebe5830ede5a313d41067e398ba | |
| parent | acc7cb5e23744ebf591e223da4a3f079a8b3f9fb (diff) | |
| download | forums-91eccc708bb0ca4143ad670be6ecddef818b9316.tar forums-91eccc708bb0ca4143ad670be6ecddef818b9316.tar.gz forums-91eccc708bb0ca4143ad670be6ecddef818b9316.tar.bz2 forums-91eccc708bb0ca4143ad670be6ecddef818b9316.tar.xz forums-91eccc708bb0ca4143ad670be6ecddef818b9316.zip | |
[ticket/11775] Fix error when moving the last post to another topic
PHPBB3-11775
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index 76985488b7..8e0e89e3da 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -668,10 +668,10 @@ function merge_posts($topic_id, $to_topic_id) } // If the topic no longer exist, we will update the topic watch table. - phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id); + phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', array($topic_id), $to_topic_id); // If the topic no longer exist, we will update the bookmarks table. - phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', $topic_id, $to_topic_id); + phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', array($topic_id), $to_topic_id); } // Link to the new topic |