diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-24 18:16:00 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-24 18:16:00 +0100 |
| commit | 3566bb9e440f2004a425ff417e44a0f4eec16c21 (patch) | |
| tree | 551ba511576d13b0153355e081471485bb4bdf47 | |
| parent | 9059864dac2f1769d801bc2fb9ef49d0f03d9c6d (diff) | |
| parent | 15157eed61e3aa50910ce557ee4e0a0f329dcc36 (diff) | |
| download | forums-3566bb9e440f2004a425ff417e44a0f4eec16c21.tar forums-3566bb9e440f2004a425ff417e44a0f4eec16c21.tar.gz forums-3566bb9e440f2004a425ff417e44a0f4eec16c21.tar.bz2 forums-3566bb9e440f2004a425ff417e44a0f4eec16c21.tar.xz forums-3566bb9e440f2004a425ff417e44a0f4eec16c21.zip | |
Merge pull request #4124 from marc1706/ticket/14411
[ticket/14411] Permanently delete post if delete_permanent is set
* marc1706/ticket/14411:
[ticket/14411] Permanently delete post if delete_permanent is set
| -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 5fcd427b2b..a7df1a018e 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -481,7 +481,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; } |