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/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/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; } |