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/network.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/network.php')
| -rw-r--r-- | mod/network.php | 2 |
1 files changed, 1 insertions, 1 deletions
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() |