mirror of
https://github.com/phpbb/phpbb.git
synced 2025-01-19 15:17:16 +01:00
git-svn-id: file:///svn/phpbb/trunk@7539 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
f8302cbebf
commit
6ee1756d9b
@ -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),
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user