diff options
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/auth.php | 9 |
3 files changed, 9 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 7af21bb30c..93ab4eedaa 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -104,6 +104,7 @@ class acp_groups if (confirm_box(true)) { $group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name']; + if (!sizeof($mark_ary)) { $start = 0; diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index 225daf01c6..6102088c8f 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -422,7 +422,7 @@ class acp_permissions $sql = 'SELECT forum_name FROM ' . FORUMS_TABLE . ' WHERE ' . $db->sql_in_set('forum_id', $forum_id) . ' - ORDER BY forum_name ASC'; + ORDER BY left_id ASC'; $result = $db->sql_query($sql); $forum_names = array(); diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index 58e8e47159..c78a2e2025 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -437,9 +437,12 @@ class auth_admin extends auth $hold_ary = array(); foreach ($hold_ary_temp as $ug_id => $row) { - foreach ($row as $forum_id => $auth_row) + foreach ($forum_names_ary as $forum_id => $forum_row) { - $hold_ary[$forum_id][$ug_id] = $auth_row; + if (isset($row[$forum_id])) + { + $hold_ary[$forum_id][$ug_id] = $row[$forum_id]; + } } } unset($hold_ary_temp); @@ -451,6 +454,8 @@ class auth_admin extends auth $template->assign_block_vars($tpl_pmask, array( 'NAME' => ($forum_id == 0) ? $forum_names_ary[0] : $forum_names_ary[$forum_id]['forum_name'], + 'PADDING' => ($forum_id == 0) ? '' : $forum_names_ary[$forum_id]['padding'], + 'CATEGORIES' => implode('</th><th>', $categories), 'L_ACL_TYPE' => $l_acl_type, |