diff options
| author | plegall <plg@piwigo.org> | 2010-01-15 10:38:55 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2010-01-15 10:38:55 +0000 |
| commit | a6780831feb015fa06ac9ad521b02a23dc0d755b (patch) | |
| tree | a8a36c50774f86ee1cc5c2f19864aeca40fa7881 /admin/include | |
| parent | 93822184cefd7fb54950c73a929256796c6f155f (diff) | |
bug 1380: now correctly synchronizes metadata on a single photo, needs a nicer
fix on trunk.
git-svn-id: http://piwigo.org/svn/branches/2.0@4680 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include')
| -rw-r--r-- | admin/include/functions_metadata.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php index c015b9e91..91d8479df 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) |