diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-12-31 15:10:36 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-12-31 15:10:36 -0800 |
| commit | 1964fa05e1b8874a094922206a1fb5f436194991 (patch) | |
| tree | cebabfed1fd8e4e56aa25105ff9d8cbbd73dd3de /mod | |
| parent | caf3a69d999853bb7cc3b7ff525c331e68f2e0ae (diff) | |
| download | volse-hubzilla-1964fa05e1b8874a094922206a1fb5f436194991.tar.gz volse-hubzilla-1964fa05e1b8874a094922206a1fb5f436194991.tar.bz2 volse-hubzilla-1964fa05e1b8874a094922206a1fb5f436194991.zip | |
issue #239, provide 'Public' text on ACL selector when appropriate to do so.
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/channel.php | 2 | ||||
| -rw-r--r-- | mod/network.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/channel.php b/mod/channel.php index 2b9d0ed89..074017466 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -128,7 +128,7 @@ function channel_content(&$a, $update = 0, $load = false) { 'default_location' => (($is_owner) ? $a->profile['channel_location'] : ''), 'nickname' => $a->profile['channel_address'], 'lockstate' => (((strlen($a->profile['channel_allow_cid'])) || (strlen($a->profile['channel_allow_gid'])) || (strlen($a->profile['channel_deny_cid'])) || (strlen($a->profile['channel_deny_gid']))) ? 'lock' : 'unlock'), - 'acl' => (($is_owner) ? populate_acl($channel_acl) : ''), + 'acl' => (($is_owner) ? populate_acl($channel_acl,true,(($a->profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')) : ''), 'showacl' => (($is_owner) ? 'yes' : ''), 'bang' => '', 'visitor' => (($is_owner || $observer) ? true : false), diff --git a/mod/network.php b/mod/network.php index 9f0604296..ba2ef761b 100644 --- a/mod/network.php +++ b/mod/network.php @@ -166,7 +166,7 @@ function network_content(&$a, $update = 0, $load = false) { 'default_location' => $channel['channel_location'], 'nickname' => $channel['channel_address'], 'lockstate' => (($private_editing || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => populate_acl((($private_editing) ? $def_acl : $channel_acl)), + 'acl' => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, (($channel['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')), 'bang' => (($private_editing) ? '!' : ''), 'visitor' => true, 'profile_uid' => local_channel() |