diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index f3d871bb2c..69d99d4d9d 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -895,7 +895,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = '' * @var string soft_delete_reason The reason we're soft deleting * @var string action The current delete action * @var array check_permission The array with a permission to check for, can be set to false to not check them - * @since 3.2.6-RC1 + * @since 3.3.2-RC1 */ $vars = array( 'topic_ids', @@ -1034,7 +1034,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = '' * @var int forum_id The current forum ID * @var bool only_softdeleted If the topic_ids are all soft deleted, this is true * @var bool only_shadow If the topic_ids are all shadow topics, this is true - * @since 3.2.6-RC1 + * @since 3.3.2-RC1 */ $vars = array( 'l_confirm', diff --git a/phpBB/mcp.php b/phpBB/mcp.php index 865ab3e54c..3a33059e7a 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -116,9 +116,9 @@ if (!$auth->acl_getf_global('m_')) ); $allow_user = false; - $topic_info = phpbb_get_topic_data(array($topic_id)); if ($quickmod && isset($user_quickmod_actions[$action]) && $user->data['is_registered'] && $auth->acl_gets($user_quickmod_actions[$action], $forum_id)) { + $topic_info = phpbb_get_topic_data(array($topic_id)); if ($topic_info[$topic_id]['topic_poster'] == $user->data['user_id']) { $allow_user = true; @@ -130,15 +130,15 @@ if (!$auth->acl_getf_global('m_')) * * @event core.mcp_modify_permissions * @var array user_quickmod_actions Array holding the quickmod actions and their respectiev permissions - * @var array topic_info An array of the current topic's data + * @var bool quickmod Whether or not the action is performed via QuickMod * @var bool allow_user Boolean holding if the user can access the mcp * @var int forum_id The current forum ID * @var int topic_id The current topic ID - * @since 3.2.6-RC1 + * @since 3.3.2-RC1 */ $vars = array( 'user_quickmod_actions', - 'topic_info', + 'quickmod', 'allow_user', 'forum_id', 'topic_id',