diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-07-22 11:30:50 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-07-22 11:30:50 +0200 |
| commit | e1cbe735380d98f2b87f4243317fd55cbc0439af (patch) | |
| tree | f7047bc58b88f666051ee4eafe001ce898763672 /phpBB/viewtopic.php | |
| parent | 8bfbd7782815aeee6ada6fa8a495b780fc21cb3d (diff) | |
| parent | 7d31232846e29311e5b76bf32f41f64da7985a79 (diff) | |
| download | forums-e1cbe735380d98f2b87f4243317fd55cbc0439af.tar forums-e1cbe735380d98f2b87f4243317fd55cbc0439af.tar.gz forums-e1cbe735380d98f2b87f4243317fd55cbc0439af.tar.bz2 forums-e1cbe735380d98f2b87f4243317fd55cbc0439af.tar.xz forums-e1cbe735380d98f2b87f4243317fd55cbc0439af.zip | |
Merge pull request #3781 from Elsensee/ticket/8708-2
[ticket/8708] Add extra permission for posting global announcements
* Elsensee/ticket/8708-2:
[ticket/8708] Apply permission 'f_announce_global'
[ticket/8708] Add f_announce_global permission
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 4 |
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)), ); |