diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-05-12 04:18:38 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-05-12 04:18:38 +0000 |
| commit | 6ee1756d9b1d3bfba83098e593a6637e65de0af4 (patch) | |
| tree | 9bc9b23243bc3889b21af0de1be0b49b98aaeff2 | |
| parent | f8302cbebf00d2fc158a1a84ea0c9af0f1a48787 (diff) | |
| download | forums-6ee1756d9b1d3bfba83098e593a6637e65de0af4.tar forums-6ee1756d9b1d3bfba83098e593a6637e65de0af4.tar.gz forums-6ee1756d9b1d3bfba83098e593a6637e65de0af4.tar.bz2 forums-6ee1756d9b1d3bfba83098e593a6637e65de0af4.tar.xz forums-6ee1756d9b1d3bfba83098e593a6637e65de0af4.zip | |
#10267
git-svn-id: file:///svn/phpbb/trunk@7539 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 2 | ||||
| -rw-r--r-- | phpBB/mcp.php | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 5fc907dddf..4230e41aec 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -116,7 +116,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info) 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id), 'U_VIEW_FORUM_LOGS' => ($auth->acl_gets('a_', 'm_', $forum_id) && $module->loaded('logs')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=logs&mode=forum_logs&f=' . $forum_id) : '', - 'S_MCP_ACTION' => $url . "&i=$id&mode=$mode&start=$start" . (($merge_select) ? $selected_ids : ''), + 'S_MCP_ACTION' => $url . "&i=$id&forum_action=$action&mode=$mode&start=$start" . (($merge_select) ? $selected_ids : ''), 'PAGINATION' => generate_pagination($url . "&i=$id&action=$action&mode=$mode" . (($merge_select) ? $selected_ids : ''), $forum_topics, $topics_per_page, $start), 'PAGE_NUMBER' => on_page($forum_topics, $topics_per_page, $start), diff --git a/phpBB/mcp.php b/phpBB/mcp.php index d1cdaa2aef..a8042c5b57 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -56,6 +56,12 @@ $quickmod = (isset($_REQUEST['quickmod'])) ? true : false; $action = request_var('action', ''); $action_ary = request_var('action', array('' => 0)); +$forum_action = request_var('forum_action', ''); +if ($forum_action !== '' && !empty($_POST['sort'])) +{ + $action = $forum_action; +} + if (sizeof($action_ary)) { list($action, ) = each($action_ary); |