[ticket/13171] Check the correct (soft)delete permission when deleting in MCP

PHPBB3-13171
This commit is contained in:
Joas Schilling 2014-10-17 15:39:20 +02:00
parent e1af6584d9
commit 66342f5b89

View file

@ -754,7 +754,8 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
{ {
global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container; global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container;
if (!phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_delete'))) $check_permission = ($is_soft) ? 'm_softdelete' : 'm_delete';
if (!phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array($check_permission)))
{ {
return; return;
} }
@ -882,7 +883,8 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',
{ {
global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container; global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container;
if (!phpbb_check_ids($post_ids, POSTS_TABLE, 'post_id', array('m_softdelete'))) $check_permission = ($is_soft) ? 'm_softdelete' : 'm_delete';
if (!phpbb_check_ids($post_ids, POSTS_TABLE, 'post_id', array($check_permission)))
{ {
return; return;
} }