diff options
| author | rxu <rxu@mail.ru> | 2015-07-30 19:35:01 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2015-07-30 19:35:01 +0700 |
| commit | 0d6c323611eeacf0170dede6bd7980be894f7020 (patch) | |
| tree | 54467cbd70bd22a7ebae9ac61fbb525f4a01f658 | |
| parent | 73fd75abf13b3e7c7f8a8d2910085a149f71631e (diff) | |
| download | forums-0d6c323611eeacf0170dede6bd7980be894f7020.tar forums-0d6c323611eeacf0170dede6bd7980be894f7020.tar.gz forums-0d6c323611eeacf0170dede6bd7980be894f7020.tar.bz2 forums-0d6c323611eeacf0170dede6bd7980be894f7020.tar.xz forums-0d6c323611eeacf0170dede6bd7980be894f7020.zip | |
[ticket/13846] Fix MCP to disallow softdeleted posts deletion if not permitted.
PHPBB3-13846
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_post.html | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 82c3bc9ab0..5f314f4b2f 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -283,6 +283,7 @@ class mcp_queue $template->assign_vars(array( 'S_MCP_QUEUE' => true, 'U_APPROVE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&p=$post_id&f=$forum_id"), + 'S_CAN_DELETE_POST' => $auth->acl_get('m_delete', $post_info['forum_id']), 'S_CAN_VIEWIP' => $auth->acl_get('m_info', $post_info['forum_id']), 'S_POST_REPORTED' => $post_info['post_reported'], 'S_POST_UNAPPROVED' => $post_info['post_visibility'] == ITEM_UNAPPROVED || $post_info['post_visibility'] == ITEM_REAPPROVE, diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 10ec6f3ea9..4bf416e1e9 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -91,9 +91,9 @@ <form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}"> <p class="post-notice deleted"> - <input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" /> + <!-- IF S_CAN_DELETE_POST --><input class="button2" type="submit" value="{L_DELETE}" name="action[delete]" /> <!-- ENDIF --> <input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" /> - <!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF --> + <!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="deleted_posts" /><!-- ENDIF --> <input type="hidden" name="post_id_list[]" value="{POST_ID}" /> {S_FORM_TOKEN} </p> |