merge r4680 from branch 2.0 to trunk

bug 1380: now correctly synchronizes metadata on a single photo, needs a nicer fix on trunk. git-svn-id: http://piwigo.org/svn/trunk@4681 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Jan 15, 2010 · 080a848 · 080a848
1 parent 5095f26
commit 080a848
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
@@ -141,11 +141,14 @@ function update_metadata($files)
     if ($conf['use_exif'])
     {
       $exif = get_sync_exif_data($file);
+      $data = array_merge($data, $exif);
     }
 
     if ($conf['use_iptc'])
     {
       $iptc = get_sync_iptc_data($file);
+      $data = array_merge($data, $iptc);
+
       if (count($iptc) > 0)
       {
         foreach (array_keys($iptc) as $key)