diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2015-01-11 20:42:42 +0100 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2015-01-11 20:46:32 +0100 |
| commit | 53169b1303d3b9be66c6b67ab031060c41a1280f (patch) | |
| tree | d7b96eca72ac90d643b26c9cadf712ab2437d5ae | |
| parent | e8464d7fe235bf2c5ac428fc38a7fada4bcfb1bb (diff) | |
| download | forums-53169b1303d3b9be66c6b67ab031060c41a1280f.tar forums-53169b1303d3b9be66c6b67ab031060c41a1280f.tar.gz forums-53169b1303d3b9be66c6b67ab031060c41a1280f.tar.bz2 forums-53169b1303d3b9be66c6b67ab031060c41a1280f.tar.xz forums-53169b1303d3b9be66c6b67ab031060c41a1280f.zip | |
[ticket/13469] Fall back to soft_delete if no permissions for delete
PHPBB3-13469
| -rw-r--r-- | phpBB/posting.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 10c3b696e6..695a71140a 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -330,14 +330,17 @@ switch ($mode) { $is_authed = true; } - break; + + // no break; case 'soft_delete': - if ($user->data['is_registered'] && $phpbb_content_visibility->can_soft_delete($forum_id, $post_data['poster_id'], $post_data['post_edit_locked'])) + if (!$is_authed && $user->data['is_registered'] && $phpbb_content_visibility->can_soft_delete($forum_id, $post_data['poster_id'], $post_data['post_edit_locked'])) { + // Fall back to soft_delete if we have no permissions to delete posts but to soft delete them $is_authed = true; + $mode = 'soft_delete'; } - else + else if (!$is_authed) { // Display the same error message for softdelete we use for delete $mode = 'delete'; |