aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-02-03 08:18:38 +0000
committerplegall <plg@piwigo.org>2011-02-03 08:18:38 +0000
commit1dc5c7ccfdba5f6177eeb7b9a5d10e9135ffabe8 (patch)
tree7659132c7e2b86e5f05b05648f2107bf85e75dad /admin/include
parent34538ef9e81052eb03c8a6859735e1cd895d1c80 (diff)
bug 270 fixed: (yes "270", submitted in 2006), time (hour:minute:second) added
in the date_creation field and in the synchronization from EXIF metadata. git-svn-id: http://piwigo.org/svn/trunk@9073 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include')
-rw-r--r--admin/include/functions_metadata.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
index 953c80b7d..1bbd87e8f 100644
--- a/admin/include/functions_metadata.php
+++ b/admin/include/functions_metadata.php
@@ -89,7 +89,11 @@ function get_sync_exif_data($file)
{
if (in_array($pwg_key, array('date_creation', 'date_available')))
{
- if (preg_match('/^(\d{4}).(\d{2}).(\d{2})/', $value, $matches))
+ if (preg_match('/^(\d{4}).(\d{2}).(\d{2}) (\d{2}).(\d{2}).(\d{2})/', $value, $matches))
+ {
+ $exif[$pwg_key] = $matches[1].'-'.$matches[2].'-'.$matches[3].' '.$matches[4].':'.$matches[5].':'.$matches[6];
+ }
+ elseif (preg_match('/^(\d{4}).(\d{2}).(\d{2})/', $value, $matches))
{
$exif[$pwg_key] = $matches[1].'-'.$matches[2].'-'.$matches[3];
}