From 568cb2e3b1d97803fb5f4588ba9bd8bce44a94de Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 15 Jan 2010 10:47:42 +0000 Subject: merge r4682 from branch 2.0 to trunk 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/trunk@4683 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/functions_metadata.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'admin/include') diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php index 2d0226c88..7cafa1c50 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) -- cgit v1.2.3