diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-05-09 09:26:38 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-05-09 09:26:38 +0200 |
| commit | c8f686b8a553586a65e5bb4ceda5d1016d1c15be (patch) | |
| tree | 7bb4ab1659e7a90c38a30a6925a0ec698867e4f5 /Zotlabs/Module/Channel.php | |
| parent | 75128e8f68e829ad9e3670dac82f075d9632dba4 (diff) | |
| parent | 94accd8a4c7500ee4f5c268fe7e84ad3ed9a6675 (diff) | |
| download | volse-hubzilla-c8f686b8a553586a65e5bb4ceda5d1016d1c15be.tar.gz volse-hubzilla-c8f686b8a553586a65e5bb4ceda5d1016d1c15be.tar.bz2 volse-hubzilla-c8f686b8a553586a65e5bb4ceda5d1016d1c15be.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'Zotlabs/Module/Channel.php')
| -rw-r--r-- | Zotlabs/Module/Channel.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 47c5f31fb..f55705442 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -9,6 +9,7 @@ require_once('include/security.php'); require_once('include/conversation.php'); require_once('include/acl_selectors.php'); require_once('include/permissions.php'); +require_once('include/PermissionDescription.php'); class Channel extends \Zotlabs\Web\Controller { @@ -132,7 +133,7 @@ function get($update = 0, $load = false) { 'default_location' => (($is_owner) ? \App::$profile['channel_location'] : ''), 'nickname' => \App::$profile['channel_address'], 'lockstate' => (((strlen(\App::$profile['channel_allow_cid'])) || (strlen(\App::$profile['channel_allow_gid'])) || (strlen(\App::$profile['channel_deny_cid'])) || (strlen(\App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'), - 'acl' => (($is_owner) ? populate_acl($channel_acl,true,((\App::$profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : ''), get_post_aclDialogDescription(), 'acl_dialog_post') : ''), + 'acl' => (($is_owner) ? populate_acl($channel_acl,true, \PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''), 'showacl' => (($is_owner) ? 'yes' : ''), 'bang' => '', 'visitor' => (($is_owner || $observer) ? true : false), |