diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-14 23:15:36 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-14 23:15:36 +0100 |
| commit | 15157eed61e3aa50910ce557ee4e0a0f329dcc36 (patch) | |
| tree | 36d942bc53722deb64a7abb9d26807a4d4233252 /phpBB | |
| parent | f979d2c7b2f93bc734ae7b87debb4457f62ea24c (diff) | |
| download | forums-15157eed61e3aa50910ce557ee4e0a0f329dcc36.tar forums-15157eed61e3aa50910ce557ee4e0a0f329dcc36.tar.gz forums-15157eed61e3aa50910ce557ee4e0a0f329dcc36.tar.bz2 forums-15157eed61e3aa50910ce557ee4e0a0f329dcc36.tar.xz forums-15157eed61e3aa50910ce557ee4e0a0f329dcc36.zip | |
[ticket/14411] Permanently delete post if delete_permanent is set
PHPBB3-14411
Diffstat (limited to 'phpBB')
| -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; } |