From d42e5a71d23093a4cce4b1a56b7482670258476d Mon Sep 17 00:00:00 2001
From: Ruslan Uzdenov <rxu@mail.ru>
Date: Mon, 17 Aug 2009 13:09:54 +0000
Subject: [PATCH] Fix bug #49625 - Performing actions in Main MCP tab does not
 return correctly Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10002 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/docs/CHANGELOG.html                       | 1 +
 phpBB/includes/mcp/mcp_front.php                | 5 +++++
 phpBB/styles/prosilver/template/mcp_front.html  | 1 +
 phpBB/styles/subsilver2/template/mcp_front.html | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 682e1c97cb..a605f3a164 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -194,6 +194,7 @@
 		<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>
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php
index 23dbb12a50..0ee3eb2466 100644
--- a/phpBB/includes/mcp/mcp_front.php
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -119,7 +119,12 @@ function mcp_front_view($id, $mode, $action)
 				$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"),
 			));
 
diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html
index c0d5fc815c..0891948fb6 100644
--- a/phpBB/styles/prosilver/template/mcp_front.html
+++ b/phpBB/styles/prosilver/template/mcp_front.html
@@ -51,6 +51,7 @@
 
 	<!-- 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>
diff --git a/phpBB/styles/subsilver2/template/mcp_front.html b/phpBB/styles/subsilver2/template/mcp_front.html
index aefc6ccd6c..7c63039259 100644
--- a/phpBB/styles/subsilver2/template/mcp_front.html
+++ b/phpBB/styles/subsilver2/template/mcp_front.html
@@ -35,7 +35,7 @@
 		</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>
+		<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}