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/Events.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/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') |