aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-05-08 10:59:40 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-05-08 10:59:40 +0200
commit4fc6e7dbc7af5bf1e8fb896188d16083d62d426e (patch)
tree38b02148a885833d06332f973271a72059a9ccbe /phpBB
parent1e28748c0c4024960df0bb89a5ba6e3510b4b471 (diff)
parent350786c9695b1ccc82cf2ea33f20efd4af05c926 (diff)
downloadforums-4fc6e7dbc7af5bf1e8fb896188d16083d62d426e.tar
forums-4fc6e7dbc7af5bf1e8fb896188d16083d62d426e.tar.gz
forums-4fc6e7dbc7af5bf1e8fb896188d16083d62d426e.tar.bz2
forums-4fc6e7dbc7af5bf1e8fb896188d16083d62d426e.tar.xz
forums-4fc6e7dbc7af5bf1e8fb896188d16083d62d426e.zip
Merge pull request #3598 from VSEphpbb/ticket/13822
[ticket/13822] Correctly display softdelete and post detail perms
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/permissions.php3
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'),