From 233bd56dd8e7b512c50e1f98314fcca07624d3aa Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Wed, 19 Oct 2005 21:56:53 +0000
Subject: - 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
---
 admin/include/functions_metadata.php | 30 ++++++++++++++++++++++++------
 doc/ChangeLog                        |  5 +++++
 2 files changed, 29 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);
   }
 }
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 035a55be7..c773565ca 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-18 Pierrick LE GALL
+
+	* bug 174 fixed: use_exif_mapping configuration parameter was not
+	used to list database fields to update from EXIF values.
+
 2005-10-18 Pierrick LE GALL
 
 	* bug 172 fixed: crash when changing password with an external
-- 
cgit v1.2.3