diff options
| author |   Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-02-18 04:56:06 +0000 |
|---|---|---|
| committer | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-02-18 04:56:06 +0000 |
| commit | fff87d544d2c6c4d6174fbd11544a3701935a911 (patch) | |
| tree | a71162bf22d4178084c91cda47609066760a57f1 | |
| parent | Bump version to 3.0.7-RC2. (diff) | |
| download | phpbb-fff87d544d2c6c4d6174fbd11544a3701935a911.tar.gz phpbb-fff87d544d2c6c4d6174fbd11544a3701935a911.tar.bz2 phpbb-fff87d544d2c6c4d6174fbd11544a3701935a911.zip | |
#57715 - Correct behavior of "force_approved_state" when value is false.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10507 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | phpBB/posting.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 7ff38d6741..f3f14289cb 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -158,7 +158,8 @@ <li>[Fix] Fix problems with firebird by no longer using 'count' as a column alias. (Bug #57455)</li> <li>[Fix] Small language correction for the FAQ page. (Bug #57825)</li> <li>[Fix] Restrict search for language/../iso.txt to folders. (Bug #57795)</li> - <li>[Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)</li> + <li>[Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)</li> + <li>[Fix] Correct behavior of "force_approved_state" when value is false. (Bug #57715)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> 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']; |