From 2690d2f92999e3aef660a63be6de0b474f28ee33 Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 24 May 2010 20:16:11 +0000 Subject: merge r6338 from branch 2.1 to trunk bug 1694 fixed: COMPUTED Exif fields were not displayed on picture.php git-svn-id: http://piwigo.org/svn/trunk@6340 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/picture_metadata.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/picture_metadata.inc.php') diff --git a/include/picture_metadata.inc.php b/include/picture_metadata.inc.php index 96f63cd50..df37b4212 100644 --- a/include/picture_metadata.inc.php +++ b/include/picture_metadata.inc.php @@ -67,14 +67,14 @@ if (($conf['show_exif']) and (function_exists('read_exif_data'))) else { $tokens = explode(';', $field); - if (isset($exif[$tokens[0]][$tokens[1]])) + if (isset($exif[$field])) { $key = $tokens[1]; - if (isset($lang['exif_field_'.$tokens[1]])) + if (isset($lang['exif_field_'.$key])) { - $key = $lang['exif_field_'.$tokens[1]]; + $key = $lang['exif_field_'.$key]; } - $tpl_meta['lines'][$key] = $exif[$tokens[0]][$tokens[1]]; + $tpl_meta['lines'][$key] = $exif[$field]; } } } -- cgit v1.2.3