diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-14 22:07:52 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-09-14 22:07:52 +0200 |
| commit | 1507c5af646cdbc4bcbd65e00a5d8ba0005fc9f5 (patch) | |
| tree | 8953583d1f0e405c17b1c3b5cec94da0c58ee6b6 /phpBB/includes/functions_posting.php | |
| parent | 2634db6031944de5c2ef6ea65b7c0cd7dfaca539 (diff) | |
| parent | 9ef01e7f82332b80435b7fed3327ea6031bfc2ab (diff) | |
| download | forums-1507c5af646cdbc4bcbd65e00a5d8ba0005fc9f5.tar forums-1507c5af646cdbc4bcbd65e00a5d8ba0005fc9f5.tar.gz forums-1507c5af646cdbc4bcbd65e00a5d8ba0005fc9f5.tar.bz2 forums-1507c5af646cdbc4bcbd65e00a5d8ba0005fc9f5.tar.xz forums-1507c5af646cdbc4bcbd65e00a5d8ba0005fc9f5.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13019] Do not hide reason field when deleting permanently.
[ticket/13019] Rename deletion reason label.
[ticket/13019] Always accept a reason for deleting a post/topic.
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 768011fa5b..1fdc7ee9ea 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -2538,7 +2538,7 @@ function phpbb_upload_popup($forum_style = 0) /** * Do the various checks required for removing posts as well as removing it */ -function phpbb_handle_post_delete($forum_id, $topic_id, $post_id, &$post_data, $is_soft = false, $soft_delete_reason = '') +function phpbb_handle_post_delete($forum_id, $topic_id, $post_id, &$post_data, $is_soft = false, $delete_reason = '') { global $user, $auth, $config, $request; global $phpbb_root_path, $phpEx; @@ -2571,19 +2571,19 @@ function phpbb_handle_post_delete($forum_id, $topic_id, $post_id, &$post_data, $ 'post_postcount' => $post_data['post_postcount'], ); - $next_post_id = delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $soft_delete_reason); + $next_post_id = delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $delete_reason); $post_username = ($post_data['poster_id'] == ANONYMOUS && !empty($post_data['post_username'])) ? $post_data['post_username'] : $post_data['username']; if ($next_post_id === false) { - add_log('mod', $forum_id, $topic_id, (($is_soft) ? 'LOG_SOFTDELETE_TOPIC' : 'LOG_DELETE_TOPIC'), $post_data['topic_title'], $post_username, $soft_delete_reason); + add_log('mod', $forum_id, $topic_id, (($is_soft) ? 'LOG_SOFTDELETE_TOPIC' : 'LOG_DELETE_TOPIC'), $post_data['topic_title'], $post_username, $delete_reason); $meta_info = append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id"); $message = $user->lang['POST_DELETED']; } else { - add_log('mod', $forum_id, $topic_id, (($is_soft) ? 'LOG_SOFTDELETE_POST' : 'LOG_DELETE_POST'), $post_data['post_subject'], $post_username, $soft_delete_reason); + add_log('mod', $forum_id, $topic_id, (($is_soft) ? 'LOG_SOFTDELETE_POST' : 'LOG_DELETE_POST'), $post_data['post_subject'], $post_username, $delete_reason); $meta_info = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&p=$next_post_id") . "#p$next_post_id"; $message = $user->lang['POST_DELETED']; |