aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/posting.php
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2008-11-04 15:54:43 +0000
committerChris Smith <toonarmy@phpbb.com>2008-11-04 15:54:43 +0000
commit1610334913db6cc3b0e23b462cd66a699f06c18e (patch)
tree9be50ba6118639a7aa9a2a58de18637af5e39e0a /phpBB/posting.php
parent7ded9151f775feabbc4ef427d9d470a00276ab74 (diff)
downloadforums-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/posting.php')
-rw-r--r--phpBB/posting.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index a3dcc27d44..1666342c9b 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1001,7 +1001,7 @@ if ($submit || $preview || $refresh)
$redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message);
// 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']))
{
meta_refresh(10, $redirect_url);
$message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD'];