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

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];
         }
       }
     }