aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_main.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-12-20 19:23:26 +0100
committerJoas Schilling <nickvergessen@gmx.de>2012-12-20 19:23:26 +0100
commit4498c5aaebb1122b783b52a66f78d56e0ff2c63c (patch)
tree633bf13ae5b5a7f9c2f50cb7d6e5648939462a07 /phpBB/includes/mcp/mcp_main.php
parent24e1881ea1fd4da0bdf6de8f58cf8527b9087270 (diff)
downloadforums-4498c5aaebb1122b783b52a66f78d56e0ff2c63c.tar
forums-4498c5aaebb1122b783b52a66f78d56e0ff2c63c.tar.gz
forums-4498c5aaebb1122b783b52a66f78d56e0ff2c63c.tar.bz2
forums-4498c5aaebb1122b783b52a66f78d56e0ff2c63c.tar.xz
forums-4498c5aaebb1122b783b52a66f78d56e0ff2c63c.zip
[feature/soft-delete] Split deleting soft-deleted posts from unapproving posts
PHPBB3-9657
Diffstat (limited to 'phpBB/includes/mcp/mcp_main.php')
-rw-r--r--phpBB/includes/mcp/mcp_main.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index d29ecfe003..cf7c8af255 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -724,7 +724,7 @@ function mcp_restore_topic($topic_ids)
/**
* Delete Topics
*/
-function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = '')
+function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = '', $action = 'delete_topic')
{
global $auth, $user, $db, $phpEx, $phpbb_root_path, $request;
@@ -739,7 +739,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
$s_hidden_fields = array(
'topic_id_list' => $topic_ids,
'f' => $forum_id,
- 'action' => 'delete_topic',
+ 'action' => $action,
'redirect' => $redirect,
);
$success_msg = '';
@@ -852,7 +852,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
/**
* Delete Posts
*/
-function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
+function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '', $action = 'delete_post')
{
global $auth, $user, $db, $phpEx, $phpbb_root_path, $request;
@@ -867,7 +867,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
$s_hidden_fields = array(
'post_id_list' => $post_ids,
'f' => $forum_id,
- 'action' => 'delete_post',
+ 'action' => $action,
'redirect' => $redirect,
);
$success_msg = '';