Changeset 27044

Timestamp:

Jan 29, 2014, 9:50:58 PM (11 years ago)

Author:

mistic100

Message:

Merged revision(s) 27043 from trunk:
str2DateTime return false on empty input

File:

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

branches/2.6/include/functions.inc.php

@@ -545 +545 @@
 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
@@ -554 +559 @@
     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)
@@ -574 +579 @@
       $date->setDate($ymdhms[0], $ymdhms[1], $ymdhms[2]);
       $date->setTime($ymdhms[3], $ymdhms[4], $ymdhms[5]);
-    }
-    
-    return $date;
+      return $date;
+    }
   }
 }