From bdd1643a7d316bdeaeca564412b4f83cd40199fd Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 9 Jul 2004 12:31:33 +0000
Subject: - added splitting of topics to mcp - added merging of posts to mcp -
 fixed parsing of acl_getf results - adjusted tracking code for important
 announcements (seems to work now)

git-svn-id: file:///svn/phpbb/trunk@4923 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/mcp.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'phpBB/mcp.php')

diff --git a/phpBB/mcp.php b/phpBB/mcp.php
index 8897c32a23..45c47dea57 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -297,6 +297,13 @@ if ($action == 'merge_select')
 	$mode = 'forum_view';
 }
 
+if (in_array($mode, array('split', 'split_all', 'split_beyond', 'merge', 'merge_posts')))
+{
+	$_REQUEST['action'] = $action = $mode;
+	$mode = 'topic_view';
+	$quickmod = 0;
+}
+
 if (!$quickmod)
 {
 	$post_id = request_var('p', 0);
@@ -334,11 +341,6 @@ switch ($mode)
 	case 'delete_post':
 		$mcp->load('mcp', 'main', $mode);
 		break;
-	case 'split':
-	case 'merge':
-	case 'fork':
-	case 'viewlogs':
-		break;
 	default:
 		trigger_error("$mode not allowed as quickmod");
 }
-- 
cgit v1.2.1