Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

php is > 5.4

Browse Source
This commit is contained in:
Frédéric FRANCE
2019-11-01 15:21:21 +01:00
parent e3b5be7475
commit da238e94e1
1 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/functions.lib.php
View File

@@ -1984,8 +1984,6 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = false, $
if ($second< 0 || $second > 60) return '';
}
if (method_exists('DateTime', 'getTimestamp'))
{
if (empty($gm) || $gm === 'server')
{
$default_timezone=@date_default_timezone_get(); // Example 'Europe/Berlin'
@@ -2028,12 +2026,6 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = false, $
$date=$dt->getTimestamp(); // should include daylight saving time
//var_dump($date);
return $date;
}
else
{
dol_print_error('', 'PHP version must be 5.4+');
return '';
}
}