Merged revision(s) 26902 from trunk:

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

1 files changed, 2 insertions, 3 deletions

diff --git a/include/functions.inc.php b/include/functions.inc.php
index 219f6dcce..1e2b1486f 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -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]);
     }