Merge branch 'dev' into 'dev'

changes to support direct messages in zot6 (set item.item_private = 2 when...

See merge request hubzilla/core!1679
This commit is contained in:
Mario
2019-06-20 17:32:10 +02:00
9 changed files with 32 additions and 21 deletions

View File

@@ -668,9 +668,10 @@ class Events extends \Zotlabs\Web\Controller {
'html'=>$html,
'plink' => array($rr['plink'],t('Link to Source'),'',''),
);
}
}
if($export) {
header('Content-type: text/calendar');
header('content-disposition: attachment; filename="' . t('calendar') . '-' . $channel['channel_address'] . '.ics"' );