diff options
| author | zottel <github@zottel.net> | 2016-08-10 13:49:48 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2016-08-10 13:49:48 +0200 |
| commit | 8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb (patch) | |
| tree | 499ab4cac571c35f6d0758f157ed85af46c8b57c /Zotlabs/Module/Settings.php | |
| parent | 6ba142fd33a74a7bdb4f3dfc8c0c0f507c293a2e (diff) | |
| parent | 7a557d31e026705fc3bd2d4f39c4c679449cef56 (diff) | |
| download | volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.tar.gz volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.tar.bz2 volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Module/Settings.php')
| -rw-r--r-- | Zotlabs/Module/Settings.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index 57a0aa535..12157944f 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -1220,6 +1220,10 @@ class Settings extends \Zotlabs\Web\Controller { '$permissions' => t('Default Post and Publish Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$aclselect' => populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))), + '$allow_cid' => acl2json($perm_defaults['allow_cid']), + '$allow_gid' => acl2json($perm_defaults['allow_gid']), + '$deny_cid' => acl2json($perm_defaults['deny_cid']), + '$deny_gid' => acl2json($perm_defaults['deny_gid']), '$suggestme' => $suggestme, '$group_select' => $group_select, '$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', get_roles()), @@ -1282,7 +1286,7 @@ class Settings extends \Zotlabs\Web\Controller { call_hooks('settings_form',$o); - $o .= '</form>' . "\r\n"; + //$o .= '</form>' . "\r\n"; return $o; } |