aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/posting.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-02 01:09:11 +0100
committerNils Adermann <naderman@naderman.de>2010-03-02 01:09:11 +0100
commit35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40 (patch)
tree098e3b3e043f6c3e31c9c922287f76e5ec726e03 /phpBB/posting.php
parent3b46681652ad0c235ccdcafc449c3d759335df17 (diff)
parent05b5dc316779f67641e17859d5c69f296b24288d (diff)
downloadforums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.tar
forums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.tar.gz
forums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.tar.bz2
forums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.tar.xz
forums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.zip
Merge commit 'release-3.0.7-RC2'
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 d5a46db9f9..6a95dce489 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1113,7 +1113,7 @@ if ($submit || $preview || $refresh)
}
// 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($post_data['force_approved_state']))
+ 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']))
{
meta_refresh(10, $redirect_url);
$message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD'];