diff options
| author | rechosen <rechosen@gmail.com> | 2013-09-23 18:08:29 +0200 |
|---|---|---|
| committer | rechosen <rechosen@gmail.com> | 2013-09-23 18:08:29 +0200 |
| commit | e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806 (patch) | |
| tree | 0c7421d14d3f803358740a2febb84bc06acd4dac /phpBB/includes/mcp | |
| parent | 564a7cc89dcd2464024b78fe2e70adef771368f2 (diff) | |
| parent | 717e2337b9276d9f9680110dff552ea536d0723c (diff) | |
| download | forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar.gz forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar.bz2 forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar.xz forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_pm_reports.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_reports.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php index cb61b25174..f0452b37a5 100644 --- a/phpBB/includes/mcp/mcp_pm_reports.php +++ b/phpBB/includes/mcp/mcp_pm_reports.php @@ -161,6 +161,7 @@ class mcp_pm_reports 'S_CLOSE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=pm_reports&mode=pm_report_details&r=' . $report_id), 'S_CAN_VIEWIP' => $auth->acl_getf_global('m_info'), 'S_POST_REPORTED' => $pm_info['message_reported'], + 'S_REPORT_CLOSED' => $report['report_closed'], 'S_USER_NOTES' => true, 'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=pm_reports&mode=pm_report_details&r=' . $report_id), diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 3f48c58073..8db5bb9727 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -189,6 +189,7 @@ class mcp_reports 'S_POST_REPORTED' => $post_info['post_reported'], 'S_POST_UNAPPROVED' => ($post_info['post_visibility'] == ITEM_UNAPPROVED), 'S_POST_LOCKED' => $post_info['post_edit_locked'], + 'S_REPORT_CLOSED' => $report['report_closed'], 'S_USER_NOTES' => true, 'U_EDIT' => ($auth->acl_get('m_edit', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&f={$post_info['forum_id']}&p={$post_info['post_id']}") : '', 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 |