aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_posting.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-09-28 16:53:38 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-09-28 16:53:38 +0200
commite5377e98c7eca8754f423ef495e4b092590f4e03 (patch)
tree6dd5b768926a11ac3320ecc5d80117ff51c8b78b /phpBB/includes/functions_posting.php
parentdc2835af785c6bf0209d91791f27a931fb334a5b (diff)
downloadforums-e5377e98c7eca8754f423ef495e4b092590f4e03.tar
forums-e5377e98c7eca8754f423ef495e4b092590f4e03.tar.gz
forums-e5377e98c7eca8754f423ef495e4b092590f4e03.tar.bz2
forums-e5377e98c7eca8754f423ef495e4b092590f4e03.tar.xz
forums-e5377e98c7eca8754f423ef495e4b092590f4e03.zip
[feature/soft-delete] Allow setting the visibility change reason
PHPBB3-9657
Diffstat (limited to 'phpBB/includes/functions_posting.php')
-rw-r--r--phpBB/includes/functions_posting.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index b63a41df7d..38f173330a 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1411,7 +1411,7 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
/**
* Delete Post
*/
-function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
+function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $softdelete_reason = '')
{
global $db, $user, $auth;
global $config, $phpEx, $phpbb_root_path;
@@ -1466,7 +1466,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
if ($is_soft)
{
- phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
+ phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
phpbb_content_visibility::hide_post($forum_id, time(), $data, $sql_data);
}
else
@@ -1501,7 +1501,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
if ($is_soft)
{
$topic_row = array();
- phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id);
+ phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason);
phpbb_content_visibility::hide_topic($topic_id, $forum_id, $topic_row, $sql_data);
}
else
@@ -1548,8 +1548,8 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
case 'delete_last_post':
if ($is_soft)
{
+ phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason, false, true);
phpbb_content_visibility::hide_post($forum_id, time(), $data, $sql_data);
- phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, false, true);
}
else
{