diff options
| author | hubzilla <git@macgirvin.com> | 2016-08-06 07:50:21 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-06 07:50:21 +1000 |
| commit | 1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53 (patch) | |
| tree | 95e9b493a6fd9b9370b230a11d59be73b9fcedd2 /Zotlabs/Module/Wiki.php | |
| parent | 709206accde6136f96f1484510edc4b61b3d52a7 (diff) | |
| parent | 531baa8fc4c29c10afdf52fc88174b8b6fd69700 (diff) | |
| download | volse-hubzilla-1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53.tar.gz volse-hubzilla-1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53.tar.bz2 volse-hubzilla-1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53.zip | |
Merge pull request #477 from git-marijus/dev
Some work to make multiple acl forms per page work
Diffstat (limited to 'Zotlabs/Module/Wiki.php')
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 24a0b6e1c..bb4e9179c 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -74,11 +74,16 @@ class Wiki extends \Zotlabs\Web\Controller { // Initialize the ACL to the channel default permissions $x = array( 'lockstate' => (( $local_observer['channel_allow_cid'] || - $local_observer['channel_allow_gid'] || - $local_observer['channel_deny_cid'] || - $local_observer['channel_deny_gid']) - ? 'lock' : 'unlock'), + $local_observer['channel_allow_gid'] || + $local_observer['channel_deny_cid'] || + $local_observer['channel_deny_gid']) + ? 'lock' : 'unlock' + ), 'acl' => populate_acl($channel_acl), + 'allow_cid' => acl2json($channel_acl['allow_cid']), + 'allow_gid' => acl2json($channel_acl['allow_gid']), + 'deny_cid' => acl2json($channel_acl['deny_cid']), + 'deny_gid' => acl2json($channel_acl['deny_gid']), 'bang' => '' ); } else { @@ -186,6 +191,10 @@ class Wiki extends \Zotlabs\Web\Controller { '$page' => $pageUrlName, '$lockstate' => $x['lockstate'], '$acl' => $x['acl'], + '$allow_cid' => $x['allow_cid'], + '$allow_gid' => $x['allow_gid'], + '$deny_cid' => $x['deny_cid'], + '$deny_gid' => $x['deny_gid'], '$bang' => $x['bang'], '$content' => $content, '$renderedContent' => $renderedContent, |