diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-12 20:50:27 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-12 20:50:27 -0700 |
| commit | 6424bac47ce7f81991d23d2407cbb4c08dbfdf69 (patch) | |
| tree | 5a664f58749fe45923f77881310cdd295859afb5 /Zotlabs/Module/Channel.php | |
| parent | a01baab4f0dc1654dfe2d2cc6fc78e5c3c8d9f4e (diff) | |
| parent | bdd7d24ac1ccf8f7c5b8939cf23a6a156da959c1 (diff) | |
| download | volse-hubzilla-6424bac47ce7f81991d23d2407cbb4c08dbfdf69.tar.gz volse-hubzilla-6424bac47ce7f81991d23d2407cbb4c08dbfdf69.tar.bz2 volse-hubzilla-6424bac47ce7f81991d23d2407cbb4c08dbfdf69.zip | |
Merge branch 'dev' into perms
Diffstat (limited to 'Zotlabs/Module/Channel.php')
| -rw-r--r-- | Zotlabs/Module/Channel.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index d09388901..c74802ec5 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -9,7 +9,6 @@ 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 { @@ -133,7 +132,7 @@ class Channel extends \Zotlabs\Web\Controller { '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, \PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''), + 'acl' => (($is_owner) ? populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''), 'showacl' => (($is_owner) ? 'yes' : ''), 'bang' => '', 'visitor' => (($is_owner || $observer) ? true : false), |