Merge pull request #21527 from comaiteseb/15.0

FIX issue Dolibarr#21495 for v15
This commit is contained in:
Laurent Destailleur 2022-07-19 18:53:04 +02:00 committed by GitHub
commit cc9c30d8c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2065,8 +2065,8 @@ class ActionComm extends CommonObject
} }
if (!empty($conf->global->AGENDA_EXPORT_FIX_TZ)) { if (!empty($conf->global->AGENDA_EXPORT_FIX_TZ)) {
$timestampStart = - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600); $timestampStart = $timestampStart - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
$timestampEnd = - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600); $timestampEnd = $timestampEnd - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
} }
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));