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

Merge pull request #2442 from delcroip/patch-2

Browse Source 
FIX: jdate returning -62169955200 on x64 machine
This commit is contained in:
Laurent Destailleur 2015-03-11 02:35:36 +01:00
commit 52e9ae5fe4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/db/DoliDB.class.php
View File

@ -275,6 +275,8 @@ abstract class DoliDB implements Database
*/
function jdate($string, $gm=false)
{
if($string==0 || $string=="0000-00-00 00:00:00")
return NULL;
$string=preg_replace('/([^0-9])/i','',$string);
$tmp=$string.'000000';
$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);