Changeset 8630


Ignore:
Timestamp:
01/12/11 15:58:28 (7 years ago)
Author:
plg
Message:

bug 2104 fixed: ability to display EXIF/IPTC metadata from HD even if the HD
is not visible for user

File:
1 edited

Legend:

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

    r6485 r8630  
    2727 */ 
    2828 
     29// $picture['current']['high_url'] may not be set if the user has no access 
     30// to the high definition, but we may want to display metadata and read the 
     31// high definition is available 
     32$high_url = null; 
     33if (isset($picture['current']['high_url'])) 
     34{ 
     35  $high_url = $picture['current']['high_url']; 
     36} 
     37else 
     38{ 
     39  $high_url = get_high_url($picture['current']); 
     40} 
     41 
    2942include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php'); 
    3043if (($conf['show_exif']) and (function_exists('read_exif_data'))) 
     
    3952  if (count($exif) == 0 and $picture['current']['has_high']) 
    4053  { 
    41     $exif = get_exif_data($picture['current']['high_url'], $exif_mapping); 
     54    $exif = get_exif_data($high_url, $exif_mapping); 
    4255  } 
    4356   
     
    8699  if (count($iptc) == 0 and $picture['current']['has_high']) 
    87100  { 
    88     $iptc = get_iptc_data($picture['current']['high_url'], $conf['show_iptc_mapping']); 
     101    $iptc = get_iptc_data($high_url, $conf['show_iptc_mapping']); 
    89102  } 
    90103 
Note: See TracChangeset for help on using the changeset viewer.