diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-10-18 18:00:38 -0400 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-10-18 18:00:38 -0400 |
| commit | 6216771ac04f41ba815c43d188e77c85aa0806a2 (patch) | |
| tree | c101c183d750be368194b531febcd464fb40d6a1 | |
| parent | 1bb3d6b4105ad22d757eef91210c64b617a0b930 (diff) | |
| parent | b3421e397dc8bff3571a6415a5e791a7baa84cd1 (diff) | |
| download | forums-6216771ac04f41ba815c43d188e77c85aa0806a2.tar forums-6216771ac04f41ba815c43d188e77c85aa0806a2.tar.gz forums-6216771ac04f41ba815c43d188e77c85aa0806a2.tar.bz2 forums-6216771ac04f41ba815c43d188e77c85aa0806a2.tar.xz forums-6216771ac04f41ba815c43d188e77c85aa0806a2.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 74bf687fc8..19a0ee3051 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -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; - 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; } @@ -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; - 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; } |