From fbf4326d5ad86b485b02a2eaef147c5edf989ad8 Mon Sep 17 00:00:00 2001 From: rvelices Date: Sun, 6 Jun 2010 10:13:42 +0000 Subject: - quick fix (maybe not the cleanest) of regression 2.0 -> 2.1 when displaying metadata on picture page (event called with different input) git-svn-id: http://piwigo.org/svn/trunk@6473 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/picture_metadata.inc.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'include/picture_metadata.inc.php') diff --git a/include/picture_metadata.inc.php b/include/picture_metadata.inc.php index df37b4212..7b4ce9dc1 100644 --- a/include/picture_metadata.inc.php +++ b/include/picture_metadata.inc.php @@ -29,18 +29,11 @@ include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php'); if (($conf['show_exif']) and (function_exists('read_exif_data'))) { - $exif_mapping = array(); - foreach ($conf['show_exif_fields'] as $field) - { - $exif_mapping[$field] = $field; - } - - $exif = get_exif_data($picture['current']['image_path'], $exif_mapping); + $exif = get_exif_data($picture['current']['image_path'], null); if (count($exif) == 0 and $picture['current']['has_high']) { - $exif = get_exif_data($picture['current']['high_url'], $exif_mapping); + $exif = get_exif_data($picture['current']['high_url'], null); } - if (count($exif) > 0) { $exif = trigger_event('format_exif_data', $exif, $picture['current'] ); -- cgit v1.2.3