Changeset 11748

Timestamp:

07/15/11 00:02:27 (22 months ago)

Author:

plg

Message:

merge r11747 from branch 2.2 to trunk

bug 2356 fixed: if the EXIF date can't be parsed, we don't use it to fill the photo date

Files:

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

trunk/admin/include/functions_metadata.php

@@ -98 +98 @@
         $exif[$pwg_key] = $matches[1].'-'.$matches[2].'-'.$matches[3];
       }
+      else
+      {
+        unset($exif[$pwg_key]);
+        continue;
+      }
     }
     $exif[$pwg_key] = addslashes($exif[$pwg_key]);