Permalink
Browse files

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
  • Loading branch information...
plegall committed Jan 15, 2010
1 parent 080a848 commit 568cb2e3b1d97803fb5f4588ba9bd8bce44a94de
Showing with 8 additions and 0 deletions.
  1. +8 −0 admin/include/functions_metadata.php
@@ -141,12 +141,20 @@ function update_metadata($files)
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)

0 comments on commit 568cb2e

Please sign in to comment.