diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-04-06 10:59:33 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-04-06 10:59:33 +0200 |
| commit | 9ab27fe1293ea9693a698747db2d089317360d7c (patch) | |
| tree | 47eb3b1a1e0455b3b213dea52f47f9c538e310e4 /phpBB | |
| parent | d49f70fbc749c3b09928eda8faefacce9ba5c2bb (diff) | |
| parent | bbd0a8985cdc85622e07b9d3c5d12ec8c5a3cb8b (diff) | |
| download | forums-9ab27fe1293ea9693a698747db2d089317360d7c.tar forums-9ab27fe1293ea9693a698747db2d089317360d7c.tar.gz forums-9ab27fe1293ea9693a698747db2d089317360d7c.tar.bz2 forums-9ab27fe1293ea9693a698747db2d089317360d7c.tar.xz forums-9ab27fe1293ea9693a698747db2d089317360d7c.zip | |
Merge pull request #3284 from Elsensee/ticket/13469
[ticket/13469] Fall back to soft_delete if no permissions for delete
Diffstat (limited to 'phpBB')
| -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 a65ba46fc9..f0446cf2db 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'; |