fix not working Export from calendar edit popup's actions

This commit is contained in:
Ralf Becker 2019-02-25 09:40:03 +01:00
parent 711e5280cb
commit 6e6137cdcb

View File

@ -2713,9 +2713,9 @@ class calendar_uiforms extends calendar_ui
} }
else else
{ {
html::content_header('event.ics','text/calendar',bytes($ical)); Api\Header\Content::type('event.ics','text/calendar',bytes($ical));
echo $ical; echo $ical;
common::egw_exit(); exit();
} }
} }
if (is_array($content)) if (is_array($content))
@ -2735,9 +2735,9 @@ class calendar_uiforms extends calendar_ui
else else
{ {
$ical =& $boical->exportVCal($events,'2.0','PUBLISH',false); $ical =& $boical->exportVCal($events,'2.0','PUBLISH',false);
html::content_header($content['file'] ? $content['file'] : 'event.ics','text/calendar',bytes($ical)); Api\Header\Content::type($content['file'] ? $content['file'] : 'event.ics','text/calendar',bytes($ical));
echo $ical; echo $ical;
common::egw_exit(); exit();
} }
} }
if (!is_array($content)) if (!is_array($content))
@ -2752,7 +2752,7 @@ class calendar_uiforms extends calendar_ui
$content['msg'] = $msg; $content['msg'] = $msg;
$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('iCal Export'); $GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('iCal Export');
$etpl = new etemplate_new('calendar.export'); $etpl = new Etemplate('calendar.export');
$etpl->exec('calendar.calendar_uiforms.export',$content); $etpl->exec('calendar.calendar_uiforms.export',$content);
} }