diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-05-22 02:20:21 +0200 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-19 22:02:39 -0500 |
| commit | 917a2fa9a6cf8b01a347df67fc14d3fc826aa3ed (patch) | |
| tree | 6239feb259baea403b498d118e528e8ce7dbdda2 /phpBB/posting.php | |
| parent | a288c4b66bdd82de70ff14750890e9829fa7d9b9 (diff) | |
| download | forums-917a2fa9a6cf8b01a347df67fc14d3fc826aa3ed.tar forums-917a2fa9a6cf8b01a347df67fc14d3fc826aa3ed.tar.gz forums-917a2fa9a6cf8b01a347df67fc14d3fc826aa3ed.tar.bz2 forums-917a2fa9a6cf8b01a347df67fc14d3fc826aa3ed.tar.xz forums-917a2fa9a6cf8b01a347df67fc14d3fc826aa3ed.zip | |
[ticket/10880] The m_approve permisson no longer implies f_noapprove.
PHPBB3-10880
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 76c8100c78..e57f5420f5 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1018,7 +1018,7 @@ if ($submit || $preview || $refresh) $forum_type = (int) $db->sql_fetchfield('forum_type'); $db->sql_freeresult($result); - if ($forum_type != FORUM_POST || !$auth->acl_get('f_post', $to_forum_id) || (!$auth->acl_get('m_approve', $to_forum_id) && !$auth->acl_get('f_noapprove', $to_forum_id))) + if ($forum_type != FORUM_POST || !$auth->acl_get('f_post', $to_forum_id) || !$auth->acl_get('f_noapprove', $to_forum_id)) { $to_forum_id = 0; } @@ -1138,8 +1138,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']; |