diff options
| author | redmatrix <git@macgirvin.com> | 2016-08-22 20:31:31 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-08-22 20:31:31 -0700 |
| commit | 0b16a5531a757c74da5a12ba4678011ed6c6d221 (patch) | |
| tree | 155f65228377a0f371f233bd1918d25f1b5a1d62 /Zotlabs/Module/Display.php | |
| parent | b7fbd0ee50428402c1d692e74d978cac236f6ae2 (diff) | |
| download | volse-hubzilla-0b16a5531a757c74da5a12ba4678011ed6c6d221.tar.gz volse-hubzilla-0b16a5531a757c74da5a12ba4678011ed6c6d221.tar.bz2 volse-hubzilla-0b16a5531a757c74da5a12ba4678011ed6c6d221.zip | |
Revert "Merge branch '1.12RC'"
This reverts commit b89c869e7ce2586852607a55717f5388c88e275d, reversing
changes made to fbb357ac47f0c5823dd30aa9b955982035cef8ba.
Diffstat (limited to 'Zotlabs/Module/Display.php')
| -rw-r--r-- | Zotlabs/Module/Display.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 35ed0c894..d1d4edc7d 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -65,7 +65,6 @@ 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(), |