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/Display.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/Display.php')
| -rw-r--r-- | Zotlabs/Module/Display.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index d1d4edc7d..35ed0c894 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -65,6 +65,7 @@ class Display extends \Zotlabs\Web\Controller { 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'acl' => populate_acl($channel_acl), + 'permissions' => $channel_acl, 'bang' => '', 'visitor' => true, 'profile_uid' => local_channel(), |