diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-07-09 12:31:33 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-07-09 12:31:33 +0000 |
| commit | bdd1643a7d316bdeaeca564412b4f83cd40199fd (patch) | |
| tree | 1e9a11bb9e84062bb04c83f0b150aeca1b44a866 /phpBB/mcp.php | |
| parent | e083255f661573641167afd52f5c41a0588e49d3 (diff) | |
| download | forums-bdd1643a7d316bdeaeca564412b4f83cd40199fd.tar forums-bdd1643a7d316bdeaeca564412b4f83cd40199fd.tar.gz forums-bdd1643a7d316bdeaeca564412b4f83cd40199fd.tar.bz2 forums-bdd1643a7d316bdeaeca564412b4f83cd40199fd.tar.xz forums-bdd1643a7d316bdeaeca564412b4f83cd40199fd.zip | |
- 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
Diffstat (limited to 'phpBB/mcp.php')
| -rw-r--r-- | phpBB/mcp.php | 12 |
1 files changed, 7 insertions, 5 deletions
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"); } |