aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhubzilla <git@macgirvin.com>2016-05-19 06:28:54 +1000
committerhubzilla <git@macgirvin.com>2016-05-19 06:28:54 +1000
commite35bd5d25127524d989b4965e9a813676f58d99f (patch)
tree59e2b6727b8a46786e006fbaf293754d5496979f
parent16f79b70e4e3fd572de4d3fc938802fa8c536bca (diff)
parentc77732b8edfbfa49cd52df4c2ac3b27a55d2ee02 (diff)
downloadvolse-hubzilla-e35bd5d25127524d989b4965e9a813676f58d99f.tar.gz
volse-hubzilla-e35bd5d25127524d989b4965e9a813676f58d99f.tar.bz2
volse-hubzilla-e35bd5d25127524d989b4965e9a813676f58d99f.zip
Merge pull request #393 from git-marijus/dev
only show $showall_origin if permission_role is custom. it does not m…
-rw-r--r--include/acl_selectors.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 136f8aa50..6b727c9a2 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -230,14 +230,14 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti
$allow_cid = $allow_gid = $deny_cid = $deny_gid = false;
$showall_origin = '';
$showall_icon = 'fa-globe';
-
+ $role = get_pconfig(local_channel(),'system','permissions_role');
if(! $emptyACL_description) {
$showall_caption = t('Visible to your default audience');
} else if (is_a($emptyACL_description, 'PermissionDescription')) {
$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();
} else {
@@ -271,7 +271,7 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti
'$showall' => $showall_caption,
'$showallOrigin' => $showall_origin,
'$showallIcon' => $showall_icon,
- '$select_label' => t('Who can see this'),
+ '$select_label' => t('Who can see this?'),
'$showlimited' => t('Custom selection'),
'$showlimitedDesc' => t('Select "Show" to allow viewing. "Don\'t show" lets you override and limit the scope of "Show".'),
'$show' => t("Show"),