diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-16 17:05:41 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-16 18:21:04 +0100 |
| commit | 0a1604a5360a8fe02b77f6fc4dbb18f5b0d3915f (patch) | |
| tree | a67c33c072ad14546f8fce55371c2df917df2d05 /phpBB/includes/acp/auth.php | |
| parent | 4cfba8f3a40c424d831b6034bdf1dc4975822406 (diff) | |
| download | forums-0a1604a5360a8fe02b77f6fc4dbb18f5b0d3915f.tar forums-0a1604a5360a8fe02b77f6fc4dbb18f5b0d3915f.tar.gz forums-0a1604a5360a8fe02b77f6fc4dbb18f5b0d3915f.tar.bz2 forums-0a1604a5360a8fe02b77f6fc4dbb18f5b0d3915f.tar.xz forums-0a1604a5360a8fe02b77f6fc4dbb18f5b0d3915f.zip | |
[ticket/14315] Apply roles options format for multiple forums too
PHPBB3-14315
Diffstat (limited to 'phpBB/includes/acp/auth.php')
| -rw-r--r-- | phpBB/includes/acp/auth.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index e1f7fb646f..31471f8611 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -553,8 +553,7 @@ class auth_admin extends \phpbb\auth\auth // Build role dropdown options $current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0; - // Output current role id to template - $template->assign_var('S_ROLE_ID', $current_role_id); + $role_options = array(); @reset($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_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, 'ROLE_NAME' => $role_name, 'TITLE' => $role_description, 'SELECTED' => $role_id == $current_role_id, - )); + ); } if (!$current_role_id && $mode != 'view') @@ -596,6 +595,8 @@ class auth_admin extends \phpbb\auth\auth '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); } |