Changeset 26903

Timestamp:

Jan 22, 2014, 11:48:06 AM (11 years ago)

Author:

mistic100

Message:

Merged revision(s) 26902 from trunk:
bug 3027: Fatal error on Configuration->Options->Photo size

File:

• branches/2.6/include/functions.inc.php (modified) (2 diffs)

branches/2.6/include/functions.inc.php

@@ -551 +551 @@
   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)
@@ -573 +571 @@
       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]);