[Phpbb-checkins] r9960 - in /branches/phpBB-3_0_0/phpBB: posting.php styles/prosilver/template/quickreply_editor.html styles/subsilver2/template/quickreply_editor.html

[Henry S. <kel...@ph...>]

Author: Kellanved
Date: Wed Aug 12 10:25:57 2009
New Revision: 9960

Log:
#49465

Modified:
    branches/phpBB-3_0_0/phpBB/posting.php
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/quickreply_editor.html

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 Wed Aug 12 10:25:57 2009
***************
*** 39,45 ****
  $delete		= (isset($_POST['delete'])) ? true : false;
  $cancel		= (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false;
  
! $refresh	= (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['cancel_unglobalise']) || $save || $load) ? true : false;
  $mode		= ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', '');
  
  $error = $post_data = array();
--- 39,45 ----
  $delete		= (isset($_POST['delete'])) ? true : false;
  $cancel		= (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false;
  
! $refresh	= (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['full_editor']) ||isset($_POST['cancel_unglobalise']) || $save || $load) ? true : false;
  $mode		= ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', '');
  
  $error = $post_data = array();
***************
*** 1365,1370 ****
--- 1365,1371 ----
  // Build Forum Rules
  generate_forum_rules($post_data);
  
+ // Posting uses is_solved for legacy reasons. Plugins have to use is_solved to force themselves to be displayed.
  if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($captcha) && $captcha->is_solved() === false) && ($mode == 'post' || $mode == 'reply' || $mode == 'quote'))
  {
  	$captcha->reset();

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html Wed Aug 12 10:25:57 2009
***************
*** 28,34 ****
  					{S_FORM_TOKEN}
  					{QR_HIDDEN_FIELDS}
  					<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
! 					<input type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" class="button2" />&nbsp;
  				</fieldset>
  			</div>
  		<span class="corners-bottom"><span></span></span></div>
--- 28,34 ----
  					{S_FORM_TOKEN}
  					{QR_HIDDEN_FIELDS}
  					<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
! 					<input type="submit" accesskey="f" tabindex="6" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />&nbsp;
  				</fieldset>
  			</div>
  		<span class="corners-bottom"><span></span></span></div>

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/quickreply_editor.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/quickreply_editor.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/quickreply_editor.html Wed Aug 12 10:25:57 2009
***************
*** 15,21 ****
  		<tr>
  			<td class="cat" colspan="2" align="center">
  				<input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" />&nbsp;
! 				<input class="btnlite" type="submit" accesskey="f" tabindex="7" name="preview" value="{L_FULL_EDITOR}" />
  
  				{S_FORM_TOKEN}
  				{QR_HIDDEN_FIELDS}
--- 15,21 ----
  		<tr>
  			<td class="cat" colspan="2" align="center">
  				<input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" />&nbsp;
! 				<input class="btnlite" type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" />
  
  				{S_FORM_TOKEN}
  				{QR_HIDDEN_FIELDS}