diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-05 23:59:19 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-16 18:21:04 +0100 |
| commit | eab1b1ad11ae2e42cf4f6c3af9f7171d6dd0837b (patch) | |
| tree | 5cdae1817bda40bf6a2b1059409987a777b51a61 /phpBB/includes/acp/auth.php | |
| parent | 49736322887029b409ff177eafca9581c6622e83 (diff) | |
| download | forums-eab1b1ad11ae2e42cf4f6c3af9f7171d6dd0837b.tar forums-eab1b1ad11ae2e42cf4f6c3af9f7171d6dd0837b.tar.gz forums-eab1b1ad11ae2e42cf4f6c3af9f7171d6dd0837b.tar.bz2 forums-eab1b1ad11ae2e42cf4f6c3af9f7171d6dd0837b.tar.xz forums-eab1b1ad11ae2e42cf4f6c3af9f7171d6dd0837b.zip | |
[ticket/14315] Correctly set default values and reset values
The permissions tooltip javascript failed at correctly passing
the default values to the page. The same applied to the
display_mask() method in includes/acp/auth.php.
PHPBB3-14315
Diffstat (limited to 'phpBB/includes/acp/auth.php')
| -rw-r--r-- | phpBB/includes/acp/auth.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index a3972158a2..755923ff8c 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -466,9 +466,6 @@ 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); - @reset($roles); while (list($role_id, $role_row) = each($roles)) { @@ -506,8 +503,9 @@ class auth_admin extends \phpbb\auth\auth 'NAME' => $ug_names_ary[$ug_id], 'UG_ID' => $ug_id, 'S_CUSTOM' => $s_custom_permissions, - 'FORUM_ID' => $forum_id) - ); + 'FORUM_ID' => $forum_id, + 'S_ROLE_ID' => $current_role_id, + )); $this->assign_cat_array($ug_array, $tpl_pmask . '.' . $tpl_fmask . '.' . $tpl_category, $tpl_mask, $ug_id, $forum_id, ($mode == 'view'), $show_trace); |