aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-06-06 10:48:59 +0000
committerrvelices <rv-github@modusoptimus.com>2010-06-06 10:48:59 +0000
commit311567388814af629636625f83db18504a2b9cd9 (patch)
tree4f0fb2bc876be15c81a0fbf78b53aa23bf8853f2
parent4664661c50f46abcefc2dec795b12677e479b229 (diff)
merge r6475
previous commit was still not ok - 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/branches/2.1@6476 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-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 7b4ce9dc1..9c5a4a980 100644
--- a/include/picture_metadata.inc.php
+++ b/include/picture_metadata.inc.php
@@ -60,14 +60,14 @@ if (($conf['show_exif']) and (function_exists('read_exif_data')))
else
{
$tokens = explode(';', $field);
- if (isset($exif[$field]))
+ if (isset($exif[$tokens[0]][$tokens[1]]))
{
$key = $tokens[1];
- if (isset($lang['exif_field_'.$key]))
+ if (isset($lang['exif_field_'.$tokens[1]]))
{
- $key = $lang['exif_field_'.$key];
+ $key = $lang['exif_field_'.$tokens[1]];
}
- $tpl_meta['lines'][$key] = $exif[$field];
+ $tpl_meta['lines'][$key] = $exif[$tokens[0]][$tokens[1]];
}
}
}