makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
* 3.1.x:
  [ticket/14411] Permanently delete post if delete_permanent is set
This commit is contained in:
Tristan Darricau 2016-01-24 18:16:16 +01:00
commit 49e4c11bad
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/posting.php
View file

@ -482,7 +482,7 @@ if ($mode == 'delete' || $mode == 'soft_delete')
} }
$delete_reason = $request->variable('delete_reason', '', true); $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; return;
} }