harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only show $showall_origin if permission_role is custom. it does not make much sense otherwise since the member is merely using a preset of permissions.

Browse Source
This commit is contained in:
Mario Vavti 2016-05-18 21:23:24 +02:00
parent 16f79b70e4
commit c77732b8ed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/acl_selectors.php
View File

@ -230,14 +230,14 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti
$allow_cid = $allow_gid = $deny_cid = $deny_gid = false; $allow_cid = $allow_gid = $deny_cid = $deny_gid = false;
$showall_origin = ''; $showall_origin = '';
$showall_icon = 'fa-globe'; $showall_icon = 'fa-globe';
$role = get_pconfig(local_channel(),'system','permissions_role');
if(! $emptyACL_description) { if(! $emptyACL_description) {
$showall_caption = t('Visible to your default audience'); $showall_caption = t('Visible to your default audience');
} else if (is_a($emptyACL_description, 'PermissionDescription')) { } else if (is_a($emptyACL_description, 'PermissionDescription')) {
$showall_caption = $emptyACL_description->get_permission_description(); $showall_caption = $emptyACL_description->get_permission_description();
$showall_origin = $emptyACL_description->get_permission_origin_description(); $showall_origin = (($role === 'custom') ? $emptyACL_description->get_permission_origin_description() : '');
$showall_icon = $emptyACL_description->get_permission_icon(); $showall_icon = $emptyACL_description->get_permission_icon();
} else { } else {
@ -271,7 +271,7 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti
'$showall' => $showall_caption, '$showall' => $showall_caption,
'$showallOrigin' => $showall_origin, '$showallOrigin' => $showall_origin,
'$showallIcon' => $showall_icon, '$showallIcon' => $showall_icon,
'$select_label' => t('Who can see this'), '$select_label' => t('Who can see this?'),
'$showlimited' => t('Custom selection'), '$showlimited' => t('Custom selection'),
'$showlimitedDesc' => t('Select "Show" to allow viewing. "Don\'t show" lets you override and limit the scope of "Show".'), '$showlimitedDesc' => t('Select "Show" to allow viewing. "Don\'t show" lets you override and limit the scope of "Show".'),
'$show' => t("Show"), '$show' => t("Show"),