aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/posting.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-02 01:05:39 +0100
committerNils Adermann <naderman@naderman.de>2010-03-02 01:05:39 +0100
commit6482e72e7c7b7d6b73cef970197789a2c139f44e (patch)
treeba68b863f4ef8f50b3ea264cf9fbba70bd3185b6 /phpBB/posting.php
parent25052e1f673383f888c907e1b8ddf43236d2ad8e (diff)
parent615b0d4e37664a2658504705b4c5a7bc533c76d8 (diff)
downloadforums-6482e72e7c7b7d6b73cef970197789a2c139f44e.tar
forums-6482e72e7c7b7d6b73cef970197789a2c139f44e.tar.gz
forums-6482e72e7c7b7d6b73cef970197789a2c139f44e.tar.bz2
forums-6482e72e7c7b7d6b73cef970197789a2c139f44e.tar.xz
forums-6482e72e7c7b7d6b73cef970197789a2c139f44e.zip
Merge commit 'release-3.0.3'
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'];