lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update agendaexport.php after review

Browse Source
This commit is contained in:
Tobias Sekan 2020-01-27 08:28:14 +01:00 committed by GitHub
parent ce9d1a320f
commit 245b6e6554
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/public/agenda/agendaexport.php
View File

@ -157,10 +157,12 @@ $agenda=new ActionComm($db);
$cachedelay=0; $cachedelay=0;
if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)) $cachedelay=$conf->global->MAIN_AGENDA_EXPORT_CACHE; 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 // Build file
if ($format == 'ical' || $format == 'vcal') 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) if ($result >= 0)
{ {
$attachment = true; $attachment = true;
@ -195,7 +197,7 @@ if ($format == 'ical' || $format == 'vcal')
if ($format == 'rss') 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) if ($result >= 0)
{ {
$attachment = false; $attachment = false;