- bug 174 fixed: use_exif_mapping configuration parameter was not used to

  list database fields to update from EXIF values.


git-svn-id: http://piwigo.org/svn/trunk@903 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 24 insertions, 6 deletions

diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
index 79e38a829..3979e0e40 100644
--- a/admin/include/functions_metadata.php
+++ b/admin/include/functions_metadata.php
@@ -135,19 +135,37 @@ function update_metadata($files)
   
   if (count($datas) > 0)
   {
-    $update_fields = array('filesize','width','height','date_metadata_update');
+    $update_fields =
+      array(
+        'filesize',
+        'width',
+        'height',
+        'date_metadata_update'
+        );
+    
     if ($conf['use_exif'])
     {
-      array_push($update_fields, 'date_creation');
+      $update_fields =
+        array_merge(
+          $update_fields,
+          array_keys($conf['use_exif_mapping'])
+          );
     }
+    
     if ($conf['use_iptc'])
     {
-      $update_fields = array_merge($update_fields,
-                                   array_keys($conf['use_iptc_mapping']));
+      $update_fields =
+        array_merge(
+          $update_fields,
+          array_keys($conf['use_iptc_mapping'])
+          );
     }
 
-    $fields = array('primary' => array('id'),
-                    'update'  => array_unique($update_fields));
+    $fields =
+      array(
+        'primary' => array('id'),
+        'update'  => array_unique($update_fields)
+        );
     mass_updates(IMAGES_TABLE, $fields, $datas);
   }
 }