diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-20 12:32:27 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-20 12:32:27 +0000 |
| commit | 1b64e411606168802ebc164a1b42c2c2bfb2d972 (patch) | |
| tree | 2946d1c7b89a1c17fe67b4e4592fe36414260867 /phpBB/posting.php | |
| parent | 2e40ba022dc9e89628b21be2731444ddeb30ee5b (diff) | |
| download | forums-1b64e411606168802ebc164a1b42c2c2bfb2d972.tar forums-1b64e411606168802ebc164a1b42c2c2bfb2d972.tar.gz forums-1b64e411606168802ebc164a1b42c2c2bfb2d972.tar.bz2 forums-1b64e411606168802ebc164a1b42c2c2bfb2d972.tar.xz forums-1b64e411606168802ebc164a1b42c2c2bfb2d972.zip | |
although we do not use force_approved_state check it nevertheless for the message displayed to the user - bug #51325
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10166 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index b241da2eab..35b247cd9c 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1121,13 +1121,13 @@ if ($submit || $preview || $refresh) // The last parameter tells submit_post if search indexer has to be run $redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message, ($update_message || $update_subject) ? true : false); - if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($captcha) && $captcha->is_solved() === true) && ($mode == 'post' || $mode == 'reply' || $mode == 'quote')) { $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'])) + if ((!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) || !empty($post_data['force_approved_state'])) { meta_refresh(10, $redirect_url); $message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD']; |