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 git-svn-id: http://piwigo.org/svn/trunk@11748 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
0431669642
commit
21b4213890
1 changed files with 5 additions and 0 deletions
|
@ -97,6 +97,11 @@ function get_sync_exif_data($file)
|
|||
{
|
||||
$exif[$pwg_key] = $matches[1].'-'.$matches[2].'-'.$matches[3];
|
||||
}
|
||||
else
|
||||
{
|
||||
unset($exif[$pwg_key]);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
$exif[$pwg_key] = addslashes($exif[$pwg_key]);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue