mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 04:04:12 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Joas Schilling
2015-04-06 10:59:46 +02:00
parent 3a6a61a8dd 9ab27fe129
commit 197369e3f9
2 changed files with 117 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/posting.php
View File

@@ -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';