archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug 1649 fixed: search EXIF/IPTC in the high definition photo if there is no

Browse source 
EXIF/IPTC in the web sized photo.

git-svn-id: http://piwigo.org/svn/trunk@6093 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-05-07 10:23:26 +00:00
commit 445182279c
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
include/picture_metadata.inc.php
View file

@ -29,7 +29,19 @@
include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php');
if (($conf['show_exif']) and (function_exists('read_exif_data')))
{
if ($exif = @read_exif_data($picture['current']['image_path']))
$exif_mapping = array();
foreach ($conf['show_exif_fields'] as $field)
{
$exif_mapping[$field] = $field;
}
$exif = get_exif_data($picture['current']['image_path'], $exif_mapping);
if (count($exif) == 0 and $picture['current']['has_high'])
{
$exif = get_exif_data($picture['current']['high_url'], $exif_mapping);
}
if (count($exif) > 0)
{
$exif = trigger_event('format_exif_data', $exif, $picture['current'] );
@ -72,8 +84,11 @@ if (($conf['show_exif']) and (function_exists('read_exif_data')))
if ($conf['show_iptc'])
{
$iptc = get_iptc_data($picture['current']['image_path'],
$conf['show_iptc_mapping']);
$iptc = get_iptc_data($picture['current']['image_path'], $conf['show_iptc_mapping']);
if (count($iptc) == 0 and $picture['current']['has_high'])
{
$iptc = get_iptc_data($picture['current']['high_url'], $conf['show_iptc_mapping']);
}
if (count($iptc) > 0)
{