makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
* 3.1.x:
  [ticket/13831] Store provided reason when deleting from Mod. Queue module.
This commit is contained in:
Andreas Fischer 2015-11-02 21:48:32 +01:00
commit 996886de17
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/mcp/mcp_queue.php
View file

@ -72,6 +72,7 @@ class mcp_queue
case 'delete': case 'delete':
$post_id_list = $request->variable('post_id_list', array(0)); $post_id_list = $request->variable('post_id_list', array(0));
$topic_id_list = $request->variable('topic_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)) if (!empty($post_id_list))
{ {
@ -80,7 +81,7 @@ class mcp_queue
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
include($phpbb_root_path . 'includes/mcp/mcp_main.' . $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)) else if (!empty($topic_id_list))
{ {
@ -89,7 +90,7 @@ class mcp_queue
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
include($phpbb_root_path . 'includes/mcp/mcp_main.' . $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 else
{ {