diff options
| author | zotlabs <mike@macgirvin.com> | 2018-05-05 02:24:37 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-05-05 02:24:37 -0700 |
| commit | 894f5bc79a7fc91ee1f5a3502f3069a48abcb4f5 (patch) | |
| tree | 55f014ff2183c88f8d51b3808840e5852dfa697f /Zotlabs | |
| parent | b47b917eb0a8bcc8e07a8978bf9a18a2e199d96c (diff) | |
| parent | 0895756658e3019b2badf876d4699e298234208c (diff) | |
| download | volse-hubzilla-894f5bc79a7fc91ee1f5a3502f3069a48abcb4f5.tar.gz volse-hubzilla-894f5bc79a7fc91ee1f5a3502f3069a48abcb4f5.tar.bz2 volse-hubzilla-894f5bc79a7fc91ee1f5a3502f3069a48abcb4f5.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 7dc8eb1bc..322a3933c 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -95,7 +95,7 @@ class Wiki extends \Zotlabs\Web\Controller { $owner['channel_deny_gid']) ? 'lock' : 'unlock' ), - 'acl' => populate_acl($owner_acl), + 'acl' => populate_acl($owner_acl, false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_wiki')), 'allow_cid' => acl2json($owner_acl['allow_cid']), 'allow_gid' => acl2json($owner_acl['allow_gid']), 'deny_cid' => acl2json($owner_acl['deny_cid']), |