diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-11-02 21:48:32 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-11-02 21:48:32 +0100 |
| commit | 996886de1794b6cd56a67c8c0f39526bf487d2d4 (patch) | |
| tree | caf544edafa5dd6db57fc4eac5b8dafbfef38429 /phpBB/includes/mcp | |
| parent | 8c2fe55caf329aca4791c0357804e64b9ee4fc0a (diff) | |
| parent | afbeda7cfd76301547fef7ea8f72d3884f9f7c8d (diff) | |
| download | forums-996886de1794b6cd56a67c8c0f39526bf487d2d4.tar forums-996886de1794b6cd56a67c8c0f39526bf487d2d4.tar.gz forums-996886de1794b6cd56a67c8c0f39526bf487d2d4.tar.bz2 forums-996886de1794b6cd56a67c8c0f39526bf487d2d4.tar.xz forums-996886de1794b6cd56a67c8c0f39526bf487d2d4.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13831] Store provided reason when deleting from Mod. Queue module.
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index cb4b590196..9fdd16e791 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -72,6 +72,7 @@ class mcp_queue case 'delete': $post_id_list = $request->variable('post_id_list', array(0)); $topic_id_list = $request->variable('topic_id_list', array(0)); + $delete_reason = $request->variable('delete_reason', '', true); if (!empty($post_id_list)) { @@ -80,7 +81,7 @@ class mcp_queue global $phpbb_root_path, $phpEx; include($phpbb_root_path . 'includes/mcp/mcp_main.' . $phpEx); } - mcp_delete_post($post_id_list, false, '', $action); + mcp_delete_post($post_id_list, false, $delete_reason, $action); } else if (!empty($topic_id_list)) { @@ -89,7 +90,7 @@ class mcp_queue global $phpbb_root_path, $phpEx; include($phpbb_root_path . 'includes/mcp/mcp_main.' . $phpEx); } - mcp_delete_topic($topic_id_list, false, '', $action); + mcp_delete_topic($topic_id_list, false, $delete_reason, $action); } else { |