Changeset 7507

Timestamp:

10/30/10 22:22:15 (3 years ago)

Author:

plg

Message:

merge r7506 from branch 2.1 to trunk

bug 1974 fixed: don't generate invalid creation date from IPTC,
if month = 0 or day = 0, then month=1 and day=1.

Files:

• trunk/admin/include/functions_metadata.php (modified) (1 diff)

trunk/admin/include/functions_metadata.php

@@ -39 +39 @@
       if (preg_match('/(\d{4})(\d{2})(\d{2})/', $value, $matches))
       {
-        $iptc[$pwg_key] = $matches[1].'-'.$matches[2].'-'.$matches[3];
+        $year = $matches[1];
+        $month = $matches[2];
+        $day = $matches[3];
+
+        if (!checkdate($month, $day, $year))
+        {
+          // we suppose the year is correct
+          $month = 1;
+          $day = 1;
+        }
+        
+        $iptc[$pwg_key] = $year.'-'.$month.'-'.$day;
       }
     }