diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-11-03 22:57:49 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-11-03 22:57:49 +0100 |
| commit | 334265fc839f95d24cce44ec675ae8cef7b4bfaa (patch) | |
| tree | 649b4692a02df6d37eb4f4f71a237f86530a5e6f /phpBB/includes | |
| parent | dfcfccf537658b83401b78afc851239f4842a4e5 (diff) | |
| download | forums-334265fc839f95d24cce44ec675ae8cef7b4bfaa.tar forums-334265fc839f95d24cce44ec675ae8cef7b4bfaa.tar.gz forums-334265fc839f95d24cce44ec675ae8cef7b4bfaa.tar.bz2 forums-334265fc839f95d24cce44ec675ae8cef7b4bfaa.tar.xz forums-334265fc839f95d24cce44ec675ae8cef7b4bfaa.zip | |
[feature/soft-delete] Fix displaying the button/permission
When the post is already softdeleted the options should only be available if
*_delete is granted.
PHPBB3-9567
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_display.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index ed91d9ad1c..6f166e2a14 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -788,7 +788,7 @@ function gen_forum_auth_level($mode, $forum_id, $forum_status) ($auth->acl_get('f_post', $forum_id) && !$locked) ? $user->lang['RULES_POST_CAN'] : $user->lang['RULES_POST_CANNOT'], ($auth->acl_get('f_reply', $forum_id) && !$locked) ? $user->lang['RULES_REPLY_CAN'] : $user->lang['RULES_REPLY_CANNOT'], ($user->data['is_registered'] && $auth->acl_gets('f_edit', 'm_edit', $forum_id) && !$locked) ? $user->lang['RULES_EDIT_CAN'] : $user->lang['RULES_EDIT_CANNOT'], - ($user->data['is_registered'] && $auth->acl_gets('f_delete', 'm_delete', $forum_id) && !$locked) ? $user->lang['RULES_DELETE_CAN'] : $user->lang['RULES_DELETE_CANNOT'], + ($user->data['is_registered'] && ($auth->acl_gets('f_delete', 'm_delete', $forum_id) || $auth->acl_gets('f_softdelete', 'm_softdelete', $forum_id)) && !$locked) ? $user->lang['RULES_DELETE_CAN'] : $user->lang['RULES_DELETE_CANNOT'], ); if ($config['allow_attachments']) |