From 245b6e65544d3cfcd32968521169362858ad2a6d Mon Sep 17 00:00:00 2001 From: Tobias Sekan Date: Mon, 27 Jan 2020 08:28:14 +0100 Subject: [PATCH] Update agendaexport.php after review --- htdocs/public/agenda/agendaexport.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php index 9b76f2b90b3..66057f724b4 100644 --- a/htdocs/public/agenda/agendaexport.php +++ b/htdocs/public/agenda/agendaexport.php @@ -157,10 +157,12 @@ $agenda=new ActionComm($db); $cachedelay=0; if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)) $cachedelay=$conf->global->MAIN_AGENDA_EXPORT_CACHE; +$exportholidays = empty($conf->global->AGENDA_SHOW_HOLIDAYS) ? 0 : 1; + // Build file if ($format == 'ical' || $format == 'vcal') { - $result=$agenda->build_exportfile($format, $type, $cachedelay, $filename, $filters); + $result=$agenda->build_exportfile($format, $type, $cachedelay, $filename, $filters, $exportholidays); if ($result >= 0) { $attachment = true; @@ -195,7 +197,7 @@ if ($format == 'ical' || $format == 'vcal') if ($format == 'rss') { - $result=$agenda->build_exportfile($format, $type, $cachedelay, $filename, $filters); + $result=$agenda->build_exportfile($format, $type, $cachedelay, $filename, $filters, $exportholidays); if ($result >= 0) { $attachment = false;