diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-04-06 10:59:46 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-04-06 10:59:46 +0200 |
| commit | 197369e3f9c5d8468add1e8f22a53c1976dac61e (patch) | |
| tree | f2524295f25a8942b4cbb9814862ac29117f59ed /phpBB/posting.php | |
| parent | 3a6a61a8dd6a2c8e14b42450496287f87c3c5975 (diff) | |
| parent | 9ab27fe1293ea9693a698747db2d089317360d7c (diff) | |
| download | forums-197369e3f9c5d8468add1e8f22a53c1976dac61e.tar forums-197369e3f9c5d8468add1e8f22a53c1976dac61e.tar.gz forums-197369e3f9c5d8468add1e8f22a53c1976dac61e.tar.bz2 forums-197369e3f9c5d8468add1e8f22a53c1976dac61e.tar.xz forums-197369e3f9c5d8468add1e8f22a53c1976dac61e.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/posting.php')
| -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 2e03710c1b..2d01922c80 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -331,14 +331,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'; |