diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-11-04 15:54:43 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-11-04 15:54:43 +0000 |
| commit | 1610334913db6cc3b0e23b462cd66a699f06c18e (patch) | |
| tree | 9be50ba6118639a7aa9a2a58de18637af5e39e0a /phpBB/includes | |
| parent | 7ded9151f775feabbc4ef427d9d470a00276ab74 (diff) | |
| download | forums-1610334913db6cc3b0e23b462cd66a699f06c18e.tar forums-1610334913db6cc3b0e23b462cd66a699f06c18e.tar.gz forums-1610334913db6cc3b0e23b462cd66a699f06c18e.tar.bz2 forums-1610334913db6cc3b0e23b462cd66a699f06c18e.tar.xz forums-1610334913db6cc3b0e23b462cd66a699f06c18e.zip | |
Fix a bug introduced in r8805 where moderators posts would be queued in forums where posts are queued.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9048 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index eaa3ab0cd3..030ce72d7c 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1608,7 +1608,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u $post_approval = 1; // Check the permissions for post approval, as well as the queue trigger where users are put on approval with a post count lower than specified. Moderators are not affected. - if (($config['enable_queue_trigger'] && $user->data['user_posts'] < $config['queue_trigger_posts'] && !$auth->acl_get('m_approve', $data['forum_id'])) || !$auth->acl_get('f_noapprove', $data['forum_id'])) + if ((($config['enable_queue_trigger'] && $user->data['user_posts'] < $config['queue_trigger_posts']) || !$auth->acl_get('f_noapprove', $data['forum_id'])) && !$auth->acl_get('m_approve', $data['forum_id'])) { $post_approval = 0; } |