diff options
| author | plegall <plg@piwigo.org> | 2011-01-12 14:59:11 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2011-01-12 14:59:11 +0000 |
| commit | 6a67800d4fe9099e2867cdfe43ae1c8c97e195ae (patch) | |
| tree | 43b5b4c803e6c002c9a2baa044defd38cca26aab | |
| parent | 0ef332fc0f78e36e168d51c9cf17df65ef0ab186 (diff) | |
merge r8630 from branch 2.1 to trunk
bug 2104 fixed: ability to display EXIF/IPTC metadata from HD even if the HD
is not visible for user
git-svn-id: http://piwigo.org/svn/trunk@8631 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | include/picture_metadata.inc.php | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/include/picture_metadata.inc.php b/include/picture_metadata.inc.php index b87ae0700..15be0b5a6 100644 --- a/include/picture_metadata.inc.php +++ b/include/picture_metadata.inc.php @@ -26,6 +26,19 @@ * */ +// $picture['current']['high_url'] may not be set if the user has no access +// to the high definition, but we may want to display metadata and read the +// high definition is available +$high_url = null; +if (isset($picture['current']['high_url'])) +{ + $high_url = $picture['current']['high_url']; +} +else +{ + $high_url = get_high_url($picture['current']); +} + include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php'); if (($conf['show_exif']) and (function_exists('read_exif_data'))) { @@ -38,7 +51,7 @@ if (($conf['show_exif']) and (function_exists('read_exif_data'))) $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); + $exif = get_exif_data($high_url, $exif_mapping); } if (count($exif) > 0) @@ -85,7 +98,7 @@ if ($conf['show_iptc']) $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']); + $iptc = get_iptc_data($high_url, $conf['show_iptc_mapping']); } if (count($iptc) > 0) |