diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-05-09 09:26:38 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-05-09 09:26:38 +0200 |
| commit | c8f686b8a553586a65e5bb4ceda5d1016d1c15be (patch) | |
| tree | 7bb4ab1659e7a90c38a30a6925a0ec698867e4f5 /Zotlabs/Module/Settings.php | |
| parent | 75128e8f68e829ad9e3670dac82f075d9632dba4 (diff) | |
| parent | 94accd8a4c7500ee4f5c268fe7e84ad3ed9a6675 (diff) | |
| download | volse-hubzilla-c8f686b8a553586a65e5bb4ceda5d1016d1c15be.tar.gz volse-hubzilla-c8f686b8a553586a65e5bb4ceda5d1016d1c15be.tar.bz2 volse-hubzilla-c8f686b8a553586a65e5bb4ceda5d1016d1c15be.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'Zotlabs/Module/Settings.php')
| -rw-r--r-- | Zotlabs/Module/Settings.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index 413648c4d..8674ca5e7 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -2,6 +2,8 @@ namespace Zotlabs\Module; /** @file */ require_once('include/zot.php'); +require_once('include/PermissionDescription.php'); + class Settings extends \Zotlabs\Web\Controller { @@ -1064,7 +1066,7 @@ class Settings extends \Zotlabs\Web\Controller { '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')), '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), - '$aclselect' => populate_acl($perm_defaults,false), + '$aclselect' => populate_acl($perm_defaults, false, \PermissionDescription::fromDescription(t('Use my default audience setting for the type of channel'))), '$suggestme' => $suggestme, '$group_select' => $group_select, '$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', get_roles()), |