diff options
author | Mario Vavti <mario@mariovavti.com> | 2016-08-03 21:16:57 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2016-08-03 21:16:57 +0200 |
commit | c50bfa07ca3a456d69d73988f42e58e3282879e9 (patch) | |
tree | 62f67ca42fa8cd19df88afa337837dc52db8986c /Zotlabs/Module/Channel.php | |
parent | d858bd9265a4a0fa3589cdb2126031998310c7c3 (diff) | |
download | volse-hubzilla-c50bfa07ca3a456d69d73988f42e58e3282879e9.tar.gz volse-hubzilla-c50bfa07ca3a456d69d73988f42e58e3282879e9.tar.bz2 volse-hubzilla-c50bfa07ca3a456d69d73988f42e58e3282879e9.zip |
multiple acl work
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 c74802ec5..59cb9f06c 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -133,6 +133,7 @@ class Channel extends \Zotlabs\Web\Controller { '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, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''), + 'permissions' => (($is_owner) ? $channel_acl : ''), 'showacl' => (($is_owner) ? 'yes' : ''), 'bang' => '', 'visitor' => (($is_owner || $observer) ? true : false), @@ -363,4 +364,4 @@ class Channel extends \Zotlabs\Web\Controller { return $o; } -}
\ No newline at end of file +} |