aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/mcp.php
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-07-22 11:30:50 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-07-22 11:30:50 +0200
commite1cbe735380d98f2b87f4243317fd55cbc0439af (patch)
treef7047bc58b88f666051ee4eafe001ce898763672 /phpBB/mcp.php
parent8bfbd7782815aeee6ada6fa8a495b780fc21cb3d (diff)
parent7d31232846e29311e5b76bf32f41f64da7985a79 (diff)
downloadforums-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/mcp.php')
-rw-r--r--phpBB/mcp.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/mcp.php b/phpBB/mcp.php
index cb53f4eec9..a5fa09ba2b 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -111,8 +111,8 @@ if (!$auth->acl_getf_global('m_'))
'lock' => 'f_user_lock',
'make_sticky' => 'f_sticky',
'make_announce' => 'f_announce',
- 'make_global' => 'f_announce',
- 'make_normal' => array('f_announce', 'f_sticky')
+ 'make_global' => 'f_announce_global',
+ 'make_normal' => array('f_announce', 'f_announce_global', 'f_sticky')
);
$allow_user = false;