diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-08-15 01:40:08 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-08-15 01:40:08 +0200 |
| commit | 1ac1b9b7ee1f1904503b28c00dc7f86a34c007b3 (patch) | |
| tree | e5d609354d5e582c80092213bd6f094a87003862 /phpBB/includes/mcp | |
| parent | 585f692e3168203645bf40d21c51309ab6572b68 (diff) | |
| parent | d089f9693accf9cb6a1fbabb5545b340a963b501 (diff) | |
| download | forums-1ac1b9b7ee1f1904503b28c00dc7f86a34c007b3.tar forums-1ac1b9b7ee1f1904503b28c00dc7f86a34c007b3.tar.gz forums-1ac1b9b7ee1f1904503b28c00dc7f86a34c007b3.tar.bz2 forums-1ac1b9b7ee1f1904503b28c00dc7f86a34c007b3.tar.xz forums-1ac1b9b7ee1f1904503b28c00dc7f86a34c007b3.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
Diffstat (limited to 'phpBB/includes/mcp')
| -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 b282258c08..9c294b96c8 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -669,10 +669,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 |