aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_permissions.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/acp/acp_permissions.php')
-rw-r--r--phpBB/includes/acp/acp_permissions.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index f3020bcaf0..99143387d6 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -32,7 +32,8 @@ class acp_permissions
$this->tpl_name = 'acp_permissions';
// Set some vars
- $action = key(request_var('action', array('' => 0)));
+ $action = request_var('action', array('' => 0));
+ $action = key($action);
$action = (isset($_POST['psubmit'])) ? 'apply_permissions' : $action;
$all_forums = request_var('all_forums', 0);
@@ -218,7 +219,7 @@ class acp_permissions
$template->assign_vars(array(
'S_SELECT_FORUM' => true,
- 'S_FORUM_OPTIONS' => make_forum_select(false, false, true))
+ 'S_FORUM_OPTIONS' => make_forum_select(false, false, true, false, false))
);
break;
@@ -231,7 +232,7 @@ class acp_permissions
continue 2;
}
- $forum_list = make_forum_select(false, false, true, false, true, true);
+ $forum_list = make_forum_select(false, false, true, false, false, true);
// Build forum options
$s_forum_options = '';