aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2014-07-16 18:31:12 +0200
committerOliver Schramm <oliver.schramm97@gmail.com>2015-07-19 21:26:47 +0200
commit7d31232846e29311e5b76bf32f41f64da7985a79 (patch)
tree5e84f565cd94d54a854f5ef5006e5dd112b3884e /phpBB/viewtopic.php
parentdf56b2ed364e24f803047c9f64d168432ba2680c (diff)
downloadforums-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/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 4a42d78b2b..b9cb226920 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -583,10 +583,10 @@ $quickmod_array = array(
'merge' => array('MERGE_POSTS', $auth->acl_get('m_merge', $forum_id)),
'merge_topic' => array('MERGE_TOPIC', $auth->acl_get('m_merge', $forum_id)),
'fork' => array('FORK_TOPIC', $auth->acl_get('m_move', $forum_id)),
- 'make_normal' => array('MAKE_NORMAL', ($allow_change_type && $auth->acl_gets('f_sticky', 'f_announce', $forum_id) && $topic_data['topic_type'] != POST_NORMAL)),
+ 'make_normal' => array('MAKE_NORMAL', ($allow_change_type && $auth->acl_gets('f_sticky', 'f_announce', 'f_announce_global', $forum_id) && $topic_data['topic_type'] != POST_NORMAL)),
'make_sticky' => array('MAKE_STICKY', ($allow_change_type && $auth->acl_get('f_sticky', $forum_id) && $topic_data['topic_type'] != POST_STICKY)),
'make_announce' => array('MAKE_ANNOUNCE', ($allow_change_type && $auth->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_ANNOUNCE)),
- 'make_global' => array('MAKE_GLOBAL', ($allow_change_type && $auth->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_GLOBAL)),
+ 'make_global' => array('MAKE_GLOBAL', ($allow_change_type && $auth->acl_get('f_announce_global', $forum_id) && $topic_data['topic_type'] != POST_GLOBAL)),
'topic_logs' => array('VIEW_TOPIC_LOGS', $auth->acl_get('m_', $forum_id)),
);