makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14315] Apply roles options format for multiple forums too

Browse source 
PHPBB3-14315
This commit is contained in:
Marc Alexander 2016-02-16 17:05:41 +01:00
parent 4cfba8f3a4
commit 0a1604a536
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -553,8 +553,7 @@ class auth_admin extends \phpbb\auth\auth
// Build role dropdown options // Build role dropdown options
$current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0; $current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0;
// Output current role id to template $role_options = array();
$template->assign_var('S_ROLE_ID', $current_role_id);
@reset($roles); @reset($roles);
while (list($role_id, $role_row) = each($roles)) while (list($role_id, $role_row) = each($roles))
@ -562,12 +561,12 @@ class auth_admin extends \phpbb\auth\auth
$role_description = (!empty($user->lang[$role_row['role_description']])) ? $user->lang[$role_row['role_description']] : nl2br($role_row['role_description']); $role_description = (!empty($user->lang[$role_row['role_description']])) ? $user->lang[$role_row['role_description']] : nl2br($role_row['role_description']);
$role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name']; $role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name'];
$template->assign_block_vars('role_options', array( $role_options[] = array(
'ID' => $role_id, 'ID' => $role_id,
'ROLE_NAME' => $role_name, 'ROLE_NAME' => $role_name,
'TITLE' => $role_description, 'TITLE' => $role_description,
'SELECTED' => $role_id == $current_role_id, 'SELECTED' => $role_id == $current_role_id,
)); );
} }
if (!$current_role_id && $mode != 'view') if (!$current_role_id && $mode != 'view')
@ -596,6 +595,8 @@ class auth_admin extends \phpbb\auth\auth
'FORUM_ID' => $forum_id) 'FORUM_ID' => $forum_id)
); );
$template->assign_block_vars_array($tpl_pmask . '.' . $tpl_fmask . '.role_options', $role_options);
$this->assign_cat_array($forum_array, $tpl_pmask . '.' . $tpl_fmask . '.' . $tpl_category, $tpl_mask, $ug_id, $forum_id, ($mode == 'view'), $show_trace); $this->assign_cat_array($forum_array, $tpl_pmask . '.' . $tpl_fmask . '.' . $tpl_category, $tpl_mask, $ug_id, $forum_id, ($mode == 'view'), $show_trace);
} }