diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-02-02 12:20:40 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-02-02 12:20:40 +0100 |
| commit | 85dfe868af187ecd6b24d2ce4bb57fbe6cb4f4d3 (patch) | |
| tree | 95cf26720872569daf039f5a177c7be9f5431aa7 /phpBB | |
| parent | 5553f33f3dfbf309decfafceeb3c145f37aa23e3 (diff) | |
| parent | ff9e16950b8dcfa7ba89aebd7f5dcc869051edc7 (diff) | |
| download | forums-85dfe868af187ecd6b24d2ce4bb57fbe6cb4f4d3.tar forums-85dfe868af187ecd6b24d2ce4bb57fbe6cb4f4d3.tar.gz forums-85dfe868af187ecd6b24d2ce4bb57fbe6cb4f4d3.tar.bz2 forums-85dfe868af187ecd6b24d2ce4bb57fbe6cb4f4d3.tar.xz forums-85dfe868af187ecd6b24d2ce4bb57fbe6cb4f4d3.zip | |
Merge remote-tracking branch 'prototech/ticket/12123' into develop
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/permissions.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php index 8319e6d123..a3fddb0b9e 100644 --- a/phpBB/phpbb/permissions.php +++ b/phpBB/phpbb/permissions.php @@ -251,6 +251,7 @@ class permissions 'f_reply' => array('lang' => 'ACL_F_REPLY', 'cat' => 'post'), 'f_edit' => array('lang' => 'ACL_F_EDIT', 'cat' => 'post'), 'f_delete' => array('lang' => 'ACL_F_DELETE', 'cat' => 'post'), + 'f_softdelete' => array('lang' => 'ACL_F_SOFTDELETE', 'cat' => 'post'), 'f_ignoreflood' => array('lang' => 'ACL_F_IGNOREFLOOD', 'cat' => 'post'), 'f_postcount' => array('lang' => 'ACL_F_POSTCOUNT', 'cat' => 'post'), 'f_noapprove' => array('lang' => 'ACL_F_NOAPPROVE', 'cat' => 'post'), |