aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-01-15 10:47:19 +0000
committerplegall <plg@piwigo.org>2010-01-15 10:47:19 +0000
commitee9232b650e1ff5f71a5a25cc81e10c53810f1e3 (patch)
tree19e234187397148bbab967596f9986eb79fe650a /admin
parenta6780831feb015fa06ac9ad521b02a23dc0d755b (diff)
feature 620: if no exif/iptc found in the "web resized" photo, then we search
into the high definition picture if available. Thanks to Jochen Roth (Polly) for the patch. git-svn-id: http://piwigo.org/svn/branches/2.0@4682 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/include/functions_metadata.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
index 91d8479df..ad64b515e 100644
--- a/admin/include/functions_metadata.php
+++ b/admin/include/functions_metadata.php
@@ -141,12 +141,20 @@ SELECT id
if ($conf['use_exif'])
{
$exif = get_sync_exif_data($file);
+ if (count($exif) == 0 and isset($data['high_filesize']))
+ {
+ $exif = get_sync_exif_data($high_file);
+ }
$data = array_merge($data, $exif);
}
if ($conf['use_iptc'])
{
$iptc = get_sync_iptc_data($file);
+ if (count($iptc) == 0 and isset($data['high_filesize']))
+ {
+ $iptc = get_sync_iptc_data($high_file);
+ }
$data = array_merge($data, $iptc);
if (count($iptc) > 0)