iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-02 19:42:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@26902 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2014-01-22 10:45:24 +00:00
parent eecb7cf42c
commit 732e0bb497
1 changed files with 2 additions and 3 deletions
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]);
}