diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-08-15 01:37:40 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-08-15 01:37:40 +0200 |
| commit | b08928ee1c9d5724d0b424cda67eefada5d54422 (patch) | |
| tree | f2569cb16f6c114851abc04a629c88d3961e35d3 /phpBB | |
| parent | acc7cb5e23744ebf591e223da4a3f079a8b3f9fb (diff) | |
| parent | c30d4025d2976db3f55a8d477e27ca5598f83f69 (diff) | |
| download | forums-b08928ee1c9d5724d0b424cda67eefada5d54422.tar forums-b08928ee1c9d5724d0b424cda67eefada5d54422.tar.gz forums-b08928ee1c9d5724d0b424cda67eefada5d54422.tar.bz2 forums-b08928ee1c9d5724d0b424cda67eefada5d54422.tar.xz forums-b08928ee1c9d5724d0b424cda67eefada5d54422.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/11775' into prep-release-3.0.12
* nickvergessen/ticket/11775:
[ticket/11775] Fix doc blocks syntax
[ticket/11775] Remove spaces at line ends
[ticket/11775] Split test into multiple steps
[ticket/11775] Add functional test for moving the last post
[ticket/11775] Backport moving of the posting functions to 3.0
[ticket/11775] Fix error when moving the last post to another topic
Diffstat (limited to 'phpBB')
| -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 |