diff options
| author | redmatrix <git@macgirvin.com> | 2016-08-05 15:40:10 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-08-05 15:40:10 -0700 |
| commit | 9068ae68ad59249df92458626808673c96b174f1 (patch) | |
| tree | f45d6c8adc857f1df3bf368d0118fc83607eb91c /Zotlabs/Module/Channel.php | |
| parent | eeabf514eab20523b847c38cf5befb7f040b7d72 (diff) | |
| parent | 1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53 (diff) | |
| download | volse-hubzilla-9068ae68ad59249df92458626808673c96b174f1.tar.gz volse-hubzilla-9068ae68ad59249df92458626808673c96b174f1.tar.bz2 volse-hubzilla-9068ae68ad59249df92458626808673c96b174f1.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
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 +} |