Changeset 4681


Ignore:
Timestamp:
01/15/10 11:40:09 (10 years ago)
Author:
plg
Message:

merge r4680 from branch 2.0 to trunk

bug 1380: now correctly synchronizes metadata on a single photo, needs a nicer
fix on trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/include/functions_metadata.php

    r4367 r4681  
    142142    { 
    143143      $exif = get_sync_exif_data($file); 
     144      $data = array_merge($data, $exif); 
    144145    } 
    145146 
     
    147148    { 
    148149      $iptc = get_sync_iptc_data($file); 
     150      $data = array_merge($data, $iptc); 
     151       
    149152      if (count($iptc) > 0) 
    150153      { 
Note: See TracChangeset for help on using the changeset viewer.