diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-09 06:53:31 +1000 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-09 06:53:31 +1000 |
| commit | 5ac262bd610097b0e756003c39bc9fad4df7c321 (patch) | |
| tree | 0c3ef6ae7bd82e2b7337d8cb4b336faee89b7d59 /Zotlabs/Module/Settings.php | |
| parent | 2b77c9a74bf4393dd3894420e602e7212c29ba42 (diff) | |
| parent | 09ef30feb0e6f38ee3de34a37270cf796850b3d4 (diff) | |
| download | volse-hubzilla-5ac262bd610097b0e756003c39bc9fad4df7c321.tar.gz volse-hubzilla-5ac262bd610097b0e756003c39bc9fad4df7c321.tar.bz2 volse-hubzilla-5ac262bd610097b0e756003c39bc9fad4df7c321.zip | |
Merge pull request #370 from Treer/permissions
ACL dialogs: Make the non-ACL-option description more accurate
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()), |