Changeset 11748


Ignore:
Timestamp:
07/15/11 00:02:27 (9 years ago)
Author:
plg
Message:

merge r11747 from branch 2.2 to trunk

bug 2356 fixed: if the EXIF date can't be parsed, we don't use it to fill the photo date

File:
1 edited

Legend:

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

    r9073 r11748  
    9898        $exif[$pwg_key] = $matches[1].'-'.$matches[2].'-'.$matches[3]; 
    9999      } 
     100      else 
     101      { 
     102        unset($exif[$pwg_key]); 
     103        continue; 
     104      } 
    100105    } 
    101106    $exif[$pwg_key] = addslashes($exif[$pwg_key]); 
Note: See TracChangeset for help on using the changeset viewer.