phpbb-checkins

[Ruslan U. <rx...@ph...>]

Author: rxu
Date: Mon Aug 17 14:09:54 2009
New Revision: 10002

Log:
Fix bug #49625 - Performing actions in Main MCP tab does not return correctly
Authorised by: AcydBurn

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_front.html
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_front.html

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Mon Aug 17 14:09:54 2009
***************
*** 194,199 ****
--- 194,200 ----
  		<li>[Fix] Fix who is online displaying incorrect data. (Bug #49485, thanks Brainy)</li>
  		<li>[Fix] Fixed incorrect &quot;topic does not exist&quot; when unapproved posts were visited without global moderator permissions. (Bug #47795)</li>
  		<li>[Fix] Prevent style switcher from blocking the tab key. (Bug #49335)</li>
+ 		<li>[Fix] Correctly redirect on MCP main page after posts approval/disapproval from it. (Bug #49625)</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php Mon Aug 17 14:09:54 2009
***************
*** 119,125 ****
--- 119,130 ----
  				$db->sql_freeresult($result);
  			}
  
+ 			$s_hidden_fields = build_hidden_fields(array(
+ 				'redirect'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main')
+ 			));
+ 
  			$template->assign_vars(array(
+ 				'S_HIDDEN_FIELDS'		=> $s_hidden_fields,
  				'S_MCP_QUEUE_ACTION'	=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue"),
  			));
  

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_front.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_front.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_front.html Mon Aug 17 14:09:54 2009
***************
*** 51,56 ****
--- 51,57 ----
  
  	<!-- IF .unapproved -->
  	<fieldset class="display-actions">
+ 		{S_HIDDEN_FIELDS}
  		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;
  		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}" />
  		<div><a href="#" onclick="marklist('mcp_queue', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp_queue', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a></div>

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_front.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_front.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_front.html Mon Aug 17 14:09:54 2009
***************
*** 35,41 ****
  		</tr>
  	<!-- ENDIF -->
  	<tr>
! 		<td class="cat" colspan="6" align="center"><input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" />&nbsp;&nbsp;<input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" /></td>
  	</tr>
  	</table>
  	{S_FORM_TOKEN}
--- 35,41 ----
  		</tr>
  	<!-- ENDIF -->
  	<tr>
! 		<td class="cat" colspan="6" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" />&nbsp;&nbsp;<input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" /></td>
  	</tr>
  	</table>
  	{S_FORM_TOKEN}