Merge pull request #16522 from FHenry/13.0

fix: warning on install
This commit is contained in:
Laurent Destailleur 2021-03-02 23:58:26 +01:00 committed by GitHub
commit 6fcec3e99b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1985,7 +1985,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
global $conf, $langs;
if ($tzoutput === 'auto') {
$tzoutput = (empty($conf) ? 'tzserver' : $conf->tzuserinputkey);
$tzoutput = (empty($conf) ? 'tzserver' : (isset($conf->tzuserinputkey) ? $conf->tzuserinputkey : 'tzserver'));
}
// Clean parameters