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

Merged revision(s) 26902 from trunk:

Browse source 
bug 3027: Fatal error on Configuration->Options->Photo size


git-svn-id: http://piwigo.org/svn/branches/2.6@26903 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2014-01-22 10:48:06 +00:00
parent b4247f00af
commit f1e62b578d
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/functions.inc.php
View file

@ -550,12 +550,10 @@ function str2DateTime($original, $format=null)
}
else
{
$date = new DateTime();
$t = trim($original, '0123456789');
if (empty($t)) // from timestamp
{
$date->setTimestamp($original);
$date = new DateTime('@'.$original);
}
else // from unknown date format (assuming something like Y-m-d H:i:s)
{
@ -572,6 +570,7 @@ function str2DateTime($original, $format=null)
if (!isset($ymdhms[4])) $ymdhms[4] = 0;
if (!isset($ymdhms[5])) $ymdhms[5] = 0;
$date = new DateTime();
$date->setDate($ymdhms[0], $ymdhms[1], $ymdhms[2]);
$date->setTime($ymdhms[3], $ymdhms[4], $ymdhms[5]);
}