adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-20 16:42:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r6338 from branch 2.1 to trunk

Browse Source 
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
This commit is contained in:
plegall
2010-05-24 20:16:11 +00:00
parent ee35b8a080
commit 2690d2f929
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/picture_metadata.inc.php
+4 -4
View File
@@ -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];
}
}
}