diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-20 14:26:46 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-20 14:26:46 +0100 |
| commit | dabe88bb3a71f54c35002c85cc2c7ada23fae318 (patch) | |
| tree | 6239feb259baea403b498d118e528e8ce7dbdda2 /phpBB/includes/functions_posting.php | |
| parent | a288c4b66bdd82de70ff14750890e9829fa7d9b9 (diff) | |
| parent | 917a2fa9a6cf8b01a347df67fc14d3fc826aa3ed (diff) | |
| download | forums-dabe88bb3a71f54c35002c85cc2c7ada23fae318.tar forums-dabe88bb3a71f54c35002c85cc2c7ada23fae318.tar.gz forums-dabe88bb3a71f54c35002c85cc2c7ada23fae318.tar.bz2 forums-dabe88bb3a71f54c35002c85cc2c7ada23fae318.tar.xz forums-dabe88bb3a71f54c35002c85cc2c7ada23fae318.zip | |
Merge remote-tracking branch 'p/ticket/10880' into develop-olympus
* p/ticket/10880:
[ticket/10880] The m_approve permisson no longer implies f_noapprove.
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index a1029ab97a..e5cbae0d71 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1698,8 +1698,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u // The variable name should be $post_approved, because it indicates if the post is approved or not $post_approval = 1; - // Check the permissions for post approval. Moderators are not affected. - if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) + // Check the permissions for post approval. + // Moderators must go through post approval like ordinary users. + if (!$auth->acl_get('f_noapprove', $data['forum_id'])) { // Post not approved, but in queue $post_approval = 0; |