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/Webpages.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/Webpages.php')
-rw-r--r-- | Zotlabs/Module/Webpages.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index d3199f223..0a48d43c6 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -127,6 +127,7 @@ class Webpages extends \Zotlabs\Web\Controller { 'nickname' => \App::$profile['channel_address'], 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'acl' => (($is_owner) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')) : ''), + 'permissions' => (($is_owner) ? $channel_acl : ''), 'showacl' => (($is_owner) ? true : false), 'visitor' => true, 'hide_location' => true, |