diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-07-16 18:31:12 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2015-07-19 21:26:47 +0200 |
| commit | 7d31232846e29311e5b76bf32f41f64da7985a79 (patch) | |
| tree | 5e84f565cd94d54a854f5ef5006e5dd112b3884e /phpBB/includes/mcp/mcp_forum.php | |
| parent | df56b2ed364e24f803047c9f64d168432ba2680c (diff) | |
| download | forums-7d31232846e29311e5b76bf32f41f64da7985a79.tar forums-7d31232846e29311e5b76bf32f41f64da7985a79.tar.gz forums-7d31232846e29311e5b76bf32f41f64da7985a79.tar.bz2 forums-7d31232846e29311e5b76bf32f41f64da7985a79.tar.xz forums-7d31232846e29311e5b76bf32f41f64da7985a79.zip | |
[ticket/8708] Apply permission 'f_announce_global'
PHPBB3-8708
Diffstat (limited to 'phpBB/includes/mcp/mcp_forum.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 9a280c0ea5..06bbf1ce41 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -131,9 +131,10 @@ function mcp_forum_view($id, $mode, $action, $forum_info) 'S_CAN_SYNC' => $auth->acl_get('m_', $forum_id), 'S_CAN_APPROVE' => $auth->acl_get('m_approve', $forum_id), 'S_MERGE_SELECT' => ($merge_select) ? true : false, - 'S_CAN_MAKE_NORMAL' => $auth->acl_gets('f_sticky', 'f_announce', $forum_id), + 'S_CAN_MAKE_NORMAL' => $auth->acl_gets('f_sticky', 'f_announce', 'f_announce_global', $forum_id), 'S_CAN_MAKE_STICKY' => $auth->acl_get('f_sticky', $forum_id), 'S_CAN_MAKE_ANNOUNCE' => $auth->acl_get('f_announce', $forum_id), + 'S_CAN_MAKE_ANNOUNCE_GLOBAL' => $auth->acl_get('f_announce_global', $forum_id), 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id), 'U_VIEW_FORUM_LOGS' => ($auth->acl_gets('a_', 'm_', $forum_id) && $module->loaded('logs')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=logs&mode=forum_logs&f=' . $forum_id) : '', |