diff options
| author | redmatrix <git@macgirvin.com> | 2016-08-05 15:40:10 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-08-05 15:40:10 -0700 |
| commit | 9068ae68ad59249df92458626808673c96b174f1 (patch) | |
| tree | f45d6c8adc857f1df3bf368d0118fc83607eb91c /Zotlabs/Module/Display.php | |
| parent | eeabf514eab20523b847c38cf5befb7f040b7d72 (diff) | |
| parent | 1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53 (diff) | |
| download | volse-hubzilla-9068ae68ad59249df92458626808673c96b174f1.tar.gz volse-hubzilla-9068ae68ad59249df92458626808673c96b174f1.tar.bz2 volse-hubzilla-9068ae68ad59249df92458626808673c96b174f1.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
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(), |