diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-08-15 01:37:56 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-08-15 01:37:56 +0200 |
| commit | d089f9693accf9cb6a1fbabb5545b340a963b501 (patch) | |
| tree | 802419f0b59789e4ce352e7abe1faa07fdfbc876 /phpBB | |
| parent | 33eb9ad53aca850586abe8d896cd718181d480c0 (diff) | |
| parent | b08928ee1c9d5724d0b424cda67eefada5d54422 (diff) | |
| download | forums-d089f9693accf9cb6a1fbabb5545b340a963b501.tar forums-d089f9693accf9cb6a1fbabb5545b340a963b501.tar.gz forums-d089f9693accf9cb6a1fbabb5545b340a963b501.tar.bz2 forums-d089f9693accf9cb6a1fbabb5545b340a963b501.tar.xz forums-d089f9693accf9cb6a1fbabb5545b340a963b501.zip | |
Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
[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 |