From 12e0e358d1b04af41c34039dbc23b54f260883fd Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sun, 11 May 2014 19:35:42 +0200 Subject: [ticket/11942] Apply the modifications to subsilver PHPBB3-11942 --- phpBB/posting.php | 1 - phpBB/styles/prosilver/template/confirm_delete_body.html | 4 ++-- phpBB/styles/subsilver2/template/confirm_delete_body.html | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'phpBB') diff --git a/phpBB/posting.php b/phpBB/posting.php index cc39f70b48..2d25aedae8 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1537,7 +1537,6 @@ $template->assign_vars(array( 'S_LOCK_POST_ALLOWED' => ($mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? true : false, 'S_LOCK_POST_CHECKED' => ($lock_post_checked) ? ' checked="checked"' : '', 'S_SOFTDELETE_CHECKED' => ($mode == 'edit' && $post_data['post_visibility'] == ITEM_DELETED) ? ' checked="checked"' : '', - 'S_DELETE_REASON' => ($mode == 'edit' && $auth->acl_get('m_softdelete', $forum_id)) ? true : false, 'S_SOFTDELETE_ALLOWED' => ($mode == 'edit' && $phpbb_content_visibility->can_soft_delete($forum_id, $post_data['poster_id'], $lock_post_checked)) ? true : false, 'S_RESTORE_ALLOWED' => $auth->acl_get('m_approve', $forum_id), 'S_IS_DELETED' => ($mode == 'edit' && $post_data['post_visibility'] == ITEM_DELETED) ? true : false, diff --git a/phpBB/styles/prosilver/template/confirm_delete_body.html b/phpBB/styles/prosilver/template/confirm_delete_body.html index e755a76ae6..31dd9896cc 100644 --- a/phpBB/styles/prosilver/template/confirm_delete_body.html +++ b/phpBB/styles/prosilver/template/confirm_delete_body.html @@ -2,7 +2,7 @@

{MESSAGE_TEXT}

- +