diff options
| author | Cesar G <prototech91@gmail.com> | 2014-09-14 10:38:56 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-09-14 10:38:56 -0700 |
| commit | bf7041eeb9682dc7a47a6837af700f9f56ec0d27 (patch) | |
| tree | dc40131303b975ed597d58e3f71f36b2323401bf /phpBB/posting.php | |
| parent | a45df1d8407082c11a61de36b4408e62049062a0 (diff) | |
| download | forums-bf7041eeb9682dc7a47a6837af700f9f56ec0d27.tar forums-bf7041eeb9682dc7a47a6837af700f9f56ec0d27.tar.gz forums-bf7041eeb9682dc7a47a6837af700f9f56ec0d27.tar.bz2 forums-bf7041eeb9682dc7a47a6837af700f9f56ec0d27.tar.xz forums-bf7041eeb9682dc7a47a6837af700f9f56ec0d27.zip | |
[ticket/13019] Always accept a reason for deleting a post/topic.
PHPBB3-13019
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 4c3d012ca5..18572a3a6c 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -436,9 +436,8 @@ if ($mode == 'delete' || $mode == 'soft_delete') trigger_error('NO_POST'); } - $allow_reason = $auth->acl_get('m_softdelete', $forum_id) || ($auth->acl_gets('m_delete', 'f_delete', $forum_id) && $auth->acl_gets('m_softdelete', 'f_softdelete', $forum_id)); - $soft_delete_reason = ($mode == 'soft_delete' && $allow_reason) ? $request->variable('delete_reason', '', true) : ''; - phpbb_handle_post_delete($forum_id, $topic_id, $post_id, $post_data, ($mode == 'soft_delete'), $soft_delete_reason); + $delete_reason = $request->variable('delete_reason', '', true); + phpbb_handle_post_delete($forum_id, $topic_id, $post_id, $post_data, ($mode == 'soft_delete'), $delete_reason); return; } @@ -1258,9 +1257,8 @@ if ($submit || $preview || $refresh) // Handle delete mode... if ($request->is_set_post('delete') || $request->is_set_post('delete_permanent')) { - $allow_reason = $auth->acl_get('m_softdelete', $forum_id) || ($auth->acl_gets('m_delete', 'f_delete', $forum_id) && $auth->acl_gets('m_softdelete', 'f_softdelete', $forum_id)); - $soft_delete_reason = (!$request->is_set_post('delete_permanent') && $allow_reason) ? $request->variable('delete_reason', '', true) : ''; - phpbb_handle_post_delete($forum_id, $topic_id, $post_id, $post_data, !$request->is_set_post('delete_permanent'), $soft_delete_reason); + $delete_reason = $request->variable('delete_reason', '', true); + phpbb_handle_post_delete($forum_id, $topic_id, $post_id, $post_data, !$request->is_set_post('delete_permanent'), $delete_reason); return; } |