diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-24 18:16:16 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-24 18:16:16 +0100 |
| commit | 49e4c11bad18a7620355cdba2f88da4bd1acc1a5 (patch) | |
| tree | 27a04e2d2cef69c1653a319378380dba46a1ee25 /phpBB/posting.php | |
| parent | 36ff2c7b59ecd0efa999f0321cf43feebae0f33b (diff) | |
| parent | 3566bb9e440f2004a425ff417e44a0f4eec16c21 (diff) | |
| download | forums-49e4c11bad18a7620355cdba2f88da4bd1acc1a5.tar forums-49e4c11bad18a7620355cdba2f88da4bd1acc1a5.tar.gz forums-49e4c11bad18a7620355cdba2f88da4bd1acc1a5.tar.bz2 forums-49e4c11bad18a7620355cdba2f88da4bd1acc1a5.tar.xz forums-49e4c11bad18a7620355cdba2f88da4bd1acc1a5.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/14411] Permanently delete post if delete_permanent is set
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 3174626f6b..6cfb877f75 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -482,7 +482,7 @@ if ($mode == 'delete' || $mode == 'soft_delete') } $delete_reason = $request->variable('delete_reason', '', true); - phpbb_handle_post_delete($forum_id, $topic_id, $post_id, $post_data, ($mode == 'soft_delete'), $delete_reason); + phpbb_handle_post_delete($forum_id, $topic_id, $post_id, $post_data, ($mode == 'soft_delete' && !$request->is_set_post('delete_permanent')), $delete_reason); return; } |