aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-05-24 20:16:11 +0000
committerplegall <plg@piwigo.org>2010-05-24 20:16:11 +0000
commit2690d2f92999e3aef660a63be6de0b474f28ee33 (patch)
tree4efb4b97e7b44d7c2bfabdcd881b487cf84cfea0
parentee35b8a0808da6e3edd86c1f82a40eaaefaf6b85 (diff)
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
-rw-r--r--include/picture_metadata.inc.php8
1 files changed, 4 insertions, 4 deletions
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];
}
}
}