Changeset 4681 for trunk/admin/include/functions_metadata.php

Timestamp:

Jan 15, 2010, 11:40:09 AM (14 years ago)

Author:

plg

Message:

merge r4680 from branch 2.0 to trunk

bug 1380: now correctly synchronizes metadata on a single photo, needs a nicer
fix on trunk.

File:

• trunk/admin/include/functions_metadata.php (modified) (2 diffs)

trunk/admin/include/functions_metadata.php

@@ -142 +142 @@
     {
       $exif = get_sync_exif_data($file);
+      $data = array_merge($data, $exif);
     }
 
@@ -147 +148 @@
     {
       $iptc = get_sync_iptc_data($file);
+      $data = array_merge($data, $iptc);
+      
       if (count($iptc) > 0)
       {