aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-07-14 22:02:27 +0000
committerplegall <plg@piwigo.org>2011-07-14 22:02:27 +0000
commit21b4213890c9951e89c196f5cc7a203b5060a025 (patch)
treeb42780c766bf585a1aff77c99807364039f2cdf1 /admin/include
parent043166964297407540ed398c09e770d4f2f8b3b8 (diff)
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
Diffstat (limited to 'admin/include')
-rw-r--r--admin/include/functions_metadata.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
index 1bbd87e8f..7f9b516b0 100644
--- a/admin/include/functions_metadata.php
+++ b/admin/include/functions_metadata.php
@@ -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]);
}