diff options
| author | zotlabs <mike@macgirvin.com> | 2018-05-21 21:15:24 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-05-21 21:15:24 -0700 |
| commit | 76d8e59e9b9fff557bb987e9f9621e5b6d8b7c0c (patch) | |
| tree | a7e02e7c0e11f9c77974312a03f696c16dc3d581 /Zotlabs/Module/Display.php | |
| parent | 1061027071fac2eedd85d795445fb0b72aa942d6 (diff) | |
| parent | fff720c00d8581bf8c56a178580d7eab68af6061 (diff) | |
| download | volse-hubzilla-76d8e59e9b9fff557bb987e9f9621e5b6d8b7c0c.tar.gz volse-hubzilla-76d8e59e9b9fff557bb987e9f9621e5b6d8b7c0c.tar.bz2 volse-hubzilla-76d8e59e9b9fff557bb987e9f9621e5b6d8b7c0c.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Display.php')
| -rw-r--r-- | Zotlabs/Module/Display.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 06c9479b2..a127ab196 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -67,8 +67,7 @@ class Display extends \Zotlabs\Web\Controller { 'default_location' => $channel['channel_location'], 'nickname' => $channel['channel_address'], '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), + 'acl' => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), 'permissions' => $channel_acl, 'bang' => '', 'visitor' => true, @@ -78,7 +77,8 @@ class Display extends \Zotlabs\Web\Controller { 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', 'bbcode' => true, - 'jotnets' => true + 'jotnets' => true, + 'reset' => t('Reset form') ); $o = '<div id="jot-popup">'; |