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/Events.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/Events.php')
| -rw-r--r-- | Zotlabs/Module/Events.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index a14e320b2..9519ca11b 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -6,6 +6,7 @@ require_once('include/bbcode.php'); require_once('include/datetime.php'); require_once('include/event.php'); require_once('include/items.php'); +require_once('include/PermissionDescription.php'); class Events extends \Zotlabs\Web\Controller { @@ -237,7 +238,7 @@ class Events extends \Zotlabs\Web\Controller { - function get() { + function get() { if(argc() > 2 && argv(1) == 'ical') { $event_id = argv(2); @@ -468,7 +469,9 @@ class Events extends \Zotlabs\Web\Controller { '$share' => array('share', t('Share this event'), $sh_checked, '', array(t('No'),t('Yes'))), '$preview' => t('Preview'), '$permissions' => t('Permission settings'), - '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults),false)), + // populating the acl dialog was a permission description from view_stream because Cal.php, which + // displays events, says "since we don't currently have an event permission - use the stream permission" + '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults), false, \PermissionDescription::fromGlobalPermission('view_stream'))), '$submit' => t('Submit'), '$advanced' => t('Advanced Options') |