diff options
| author | mrjive <mrjive@mrjive.it> | 2016-01-03 09:52:37 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2016-01-03 09:52:37 +0100 |
| commit | 07f5bdde60f55e3b217aee9e33c3175e90a5f0f1 (patch) | |
| tree | 2b5988c7661c9a5a67f5da8797ca57381e2aad7a /mod/channel.php | |
| parent | 051346325609f5f2e78ef0deaf182c65d7823bbc (diff) | |
| parent | 5b0a17359d6b5b3e27219c9e56117f1017996175 (diff) | |
| download | volse-hubzilla-07f5bdde60f55e3b217aee9e33c3175e90a5f0f1.tar.gz volse-hubzilla-07f5bdde60f55e3b217aee9e33c3175e90a5f0f1.tar.bz2 volse-hubzilla-07f5bdde60f55e3b217aee9e33c3175e90a5f0f1.zip | |
Merge pull request #10 from redmatrix/master
updating from original codebase
Diffstat (limited to 'mod/channel.php')
| -rw-r--r-- | mod/channel.php | 2 |
1 files changed, 1 insertions, 1 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), |