aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-01-15 10:40:09 +0000
committerplegall <plg@piwigo.org>2010-01-15 10:40:09 +0000
commit080a84810ef4d056057b22d727fd0b7ea87d8413 (patch)
tree93710181e81a37269aea1cc0938e53bf77d9e8a2 /admin
parent5095f260943f45b18b5323ee15f064114d04830e (diff)
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
Diffstat (limited to '')
-rw-r--r--admin/include/functions_metadata.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
index a4d5588d4..2d0226c88 100644
--- a/admin/include/functions_metadata.php
+++ b/admin/include/functions_metadata.php
@@ -141,11 +141,14 @@ SELECT id
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)