diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-20 14:28:01 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-20 14:28:01 +0100 |
| commit | 3fefa5bb134598979105afd3f27f7ca88b12f655 (patch) | |
| tree | 85614dbf61fc59e959f394d835a7c5749117c025 /phpBB/posting.php | |
| parent | 3701d83ecbd358c2ac78b74e314ddb74ce7d1812 (diff) | |
| parent | dabe88bb3a71f54c35002c85cc2c7ada23fae318 (diff) | |
| download | forums-3fefa5bb134598979105afd3f27f7ca88b12f655.tar forums-3fefa5bb134598979105afd3f27f7ca88b12f655.tar.gz forums-3fefa5bb134598979105afd3f27f7ca88b12f655.tar.bz2 forums-3fefa5bb134598979105afd3f27f7ca88b12f655.tar.xz forums-3fefa5bb134598979105afd3f27f7ca88b12f655.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10880] The m_approve permisson no longer implies f_noapprove.
Conflicts:
phpBB/posting.php
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 2d3cb9ab44..d32f7e33d9 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1116,8 +1116,9 @@ if ($submit || $preview || $refresh) $captcha->reset(); } - // 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']) && empty($data['force_approved_state'])) || (isset($data['force_approved_state']) && !$data['force_approved_state'])) + // Check the permissions for post approval. + // Moderators must go through post approval like ordinary users. + if ((!$auth->acl_get('f_noapprove', $data['forum_id']) && empty($data['force_approved_state'])) || (isset($data['force_approved_state']) && !$data['force_approved_state'])) { meta_refresh(10, $redirect_url); $message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD']; |