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

[ticket/14315] Correctly set default values and reset values

Browse Source 
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
This commit is contained in:
Marc Alexander
2016-02-05 23:59:19 +01:00
parent 4973632288
commit eab1b1ad11
3 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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