archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

str2DateTime return false on empty input

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@27043 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2014-01-29 20:49:19 +00:00
parent fe98d56e38
commit 8a8c8c161d
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/functions.inc.php
View file

@ -544,7 +544,12 @@ function dateDiff($date1, $date2)
*/
function str2DateTime($original, $format=null)
{
if ( !empty($format) && version_compare(PHP_VERSION, '5.3.0') >= 0 )// from known date format
if (empty($original))
{
return false;
}
if (!empty($format) && version_compare(PHP_VERSION, '5.3.0') >= 0)// from known date format
{
return DateTime::createFromFormat('!'.$format, $original); // ! char to reset fields to UNIX epoch
}
@ -553,7 +558,7 @@ function str2DateTime($original, $format=null)
$t = trim($original, '0123456789');
if (empty($t)) // from timestamp
{
$date = new DateTime('@'.$original);
return new DateTime('@'.$original);
}
else // from unknown date format (assuming something like Y-m-d H:i:s)
{
@ -573,9 +578,8 @@ function str2DateTime($original, $format=null)
$date = new DateTime();
$date->setDate($ymdhms[0], $ymdhms[1], $ymdhms[2]);
$date->setTime($ymdhms[3], $ymdhms[4], $ymdhms[5]);
return $date;
}
return $date;
}
}