Ignore:
Timestamp:
Jun 6, 2010, 12:48:59 PM (14 years ago)
Author:
rvelices
Message:

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)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1/include/picture_metadata.inc.php

    r6474 r6476  
    6161      {
    6262        $tokens = explode(';', $field);
    63         if (isset($exif[$field]))
     63        if (isset($exif[$tokens[0]][$tokens[1]]))
    6464        {
    6565          $key = $tokens[1];
    66           if (isset($lang['exif_field_'.$key]))
     66          if (isset($lang['exif_field_'.$tokens[1]]))
    6767          {
    68             $key = $lang['exif_field_'.$key];
     68            $key = $lang['exif_field_'.$tokens[1]];
    6969          }
    70           $tpl_meta['lines'][$key] = $exif[$field];
     70          $tpl_meta['lines'][$key] = $exif[$tokens[0]][$tokens[1]];
    7171        }
    7272      }
Note: See TracChangeset for help on using the changeset viewer.