archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r6475

Browse source 
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
This commit is contained in:
rvelices 2010-06-06 10:48:59 +00:00
parent 4664661c50
commit 3115673888
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/picture_metadata.inc.php
View file

@ -60,14 +60,14 @@ if (($conf['show_exif']) and (function_exists('read_exif_data')))
else else
{ {
$tokens = explode(';', $field); $tokens = explode(';', $field);
if (isset($exif[$field])) if (isset($exif[$tokens[0]][$tokens[1]]))
{ {
$key = $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]];
} }
} }
} }