aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/posting.php
diff options
context:
space:
mode:
authorJosh Woody <a_jelly_doughnut@phpbb.com>2010-02-18 04:57:23 +0000
committerJosh Woody <a_jelly_doughnut@phpbb.com>2010-02-18 04:57:23 +0000
commitd49806a04356c1aa51e4a45911df850f4318b6a5 (patch)
tree0ccbe301bd940217679f9830c7fd1f1e3855d153 /phpBB/posting.php
parent576722cead7f2de34db3e5a853662bca0e0601da (diff)
downloadforums-d49806a04356c1aa51e4a45911df850f4318b6a5.tar
forums-d49806a04356c1aa51e4a45911df850f4318b6a5.tar.gz
forums-d49806a04356c1aa51e4a45911df850f4318b6a5.tar.bz2
forums-d49806a04356c1aa51e4a45911df850f4318b6a5.tar.xz
forums-d49806a04356c1aa51e4a45911df850f4318b6a5.zip
#57715 - Correct behavior of "force_approved_state" when value is false.
(Merging r10507 into branches/phpBB-3_0_0) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10508 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 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'];