diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-05-08 11:00:22 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-05-08 11:00:22 +0200 |
| commit | 3f84473306d2a5c06adb726fbd22a6a18555c47e (patch) | |
| tree | 97a72ae6dc91e1bf9b87b7ea757834034e230dfb | |
| parent | d27558668901b0cef73b3c7bcc6a0d5c7d3624eb (diff) | |
| parent | 4fc6e7dbc7af5bf1e8fb896188d16083d62d426e (diff) | |
| download | forums-3f84473306d2a5c06adb726fbd22a6a18555c47e.tar forums-3f84473306d2a5c06adb726fbd22a6a18555c47e.tar.gz forums-3f84473306d2a5c06adb726fbd22a6a18555c47e.tar.bz2 forums-3f84473306d2a5c06adb726fbd22a6a18555c47e.tar.xz forums-3f84473306d2a5c06adb726fbd22a6a18555c47e.zip | |
Merge branch '3.1.x'
| -rw-r--r-- | phpBB/phpbb/permissions.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php index 9b3dcadf32..82f59b5c20 100644 --- a/phpBB/phpbb/permissions.php +++ b/phpBB/phpbb/permissions.php @@ -277,13 +277,14 @@ class permissions 'm_approve' => array('lang' => 'ACL_M_APPROVE', 'cat' => 'post_actions'), 'm_report' => array('lang' => 'ACL_M_REPORT', 'cat' => 'post_actions'), 'm_chgposter' => array('lang' => 'ACL_M_CHGPOSTER', 'cat' => 'post_actions'), + 'm_info' => array('lang' => 'ACL_M_INFO', 'cat' => 'post_actions'), + 'm_softdelete' => array('lang' => 'ACL_M_SOFTDELETE', 'cat' => 'post_actions'), 'm_move' => array('lang' => 'ACL_M_MOVE', 'cat' => 'topic_actions'), 'm_lock' => array('lang' => 'ACL_M_LOCK', 'cat' => 'topic_actions'), 'm_split' => array('lang' => 'ACL_M_SPLIT', 'cat' => 'topic_actions'), 'm_merge' => array('lang' => 'ACL_M_MERGE', 'cat' => 'topic_actions'), - 'm_info' => array('lang' => 'ACL_M_INFO', 'cat' => 'misc'), 'm_warn' => array('lang' => 'ACL_M_WARN', 'cat' => 'misc'), 'm_ban' => array('lang' => 'ACL_M_BAN', 'cat' => 'misc'), |