Changeset 5229 for extensions/AMetaData/JpegMetaData/Common/ConvertData.class.php

Timestamp:

Mar 21, 2010, 9:48:21 PM (15 years ago)

Author:

grum

Message:

fix bug when formating dates : invalid dates are now ignored

File:

• extensions/AMetaData/JpegMetaData/Common/ConvertData.class.php (modified) (1 diff)

extensions/AMetaData/JpegMetaData/Common/ConvertData.class.php

@@ -288 +288 @@
     static public function toDateTime($dateTime)
     {
-      if(preg_match('/^(\d{4}:\d{2}:\d{2}\s\d{2}:\d{2}(:\d{2}){0,1}\x00{0,1}|\d{4}-\d{2}-\d{2}(T|\s)\d{2}:\d{2}(:\d{2}){0,1}(Z|[+|-]\d{2}:\d{2}){0,1}|\d{4}\d{2}\d{2})/', $dateTime))
+      if(preg_match('/^('.
+           '\d{4}:\d{2}:\d{2}\s\d{2}:\d{2}(:\d{2}){0,1}\x00{0,1}|'.
+           '\d{4}-\d{2}-\d{2}(T|\s)\d{2}:\d{2}(:\d{2}){0,1}(Z|[+|-]\d{2}:\d{2}){0,1}|'.
+           '\d{4}\d{2}\d{2}'.
+           ')$/', $dateTime))
       {
         $returned=new DateTime($dateTime, new DateTimeZone("UTC"));