mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

again... some more fixes.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@7150 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-03-08 15:49:13 +00:00
parent 738d26f92c
commit fcec5b61da
18 changed files with 154 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/includes/acp/acp_groups.php
View File

@@ -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;

2
phpBB/includes/acp/acp_permissions.php
View File

@@ -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();

9
phpBB/includes/acp/auth.php
View File

@@ -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,