[Phpbb-checkins] r10166 - /branches/phpBB-3_0_0/phpBB/posting.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Sun Sep 20 13:32:27 2009
New Revision: 10166

Log:
although we do not use force_approved_state check it nevertheless for the message displayed to the user - bug #51325

Modified:
    branches/phpBB-3_0_0/phpBB/posting.php

Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Sun Sep 20 13:32:27 2009
***************
*** 1121,1133 ****
  			// The last parameter tells submit_post if search indexer has to be run
  			$redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message, ($update_message || $update_subject) ? true : false);
  
- 
  			if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($captcha) && $captcha->is_solved() === true) && ($mode == 'post' || $mode == 'reply' || $mode == 'quote'))
  			{
  				$captcha->reset();
  			}
  			// 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']))
  			{
  				meta_refresh(10, $redirect_url);
  				$message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD'];
--- 1121,1133 ----
  			// The last parameter tells submit_post if search indexer has to be run
  			$redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message, ($update_message || $update_subject) ? true : false);
  
  			if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($captcha) && $captcha->is_solved() === true) && ($mode == 'post' || $mode == 'reply' || $mode == 'quote'))
  			{
  				$captcha->reset();
  			}
+ 
  			// 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']))
  			{
  				meta_refresh(10, $redirect_url);
  				$message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD'];