From 1a56352d0854adc604c4efd640297276e5ce37ce Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 10 Feb 2012 13:57:11 +0000 Subject: merge r13080 from branch 2.3 to trunk bug 559 fixed: avoid duplicate insert on tags when synchronizing metadata if the IPTC keywords contains repeated separators like "tag1,,tag2". git-svn-id: http://piwigo.org/svn/trunk@13081 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/functions_metadata.php | 1 + 1 file changed, 1 insertion(+) diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php index 45680e8e0..d231722ad 100644 --- a/admin/include/functions_metadata.php +++ b/admin/include/functions_metadata.php @@ -58,6 +58,7 @@ function get_sync_iptc_data($file) { // official keywords separator is the comma $iptc['keywords'] = preg_replace('/[.;]/', ',', $iptc['keywords']); + $iptc['keywords'] = preg_replace('/,+/', ',', $iptc['keywords']); $iptc['keywords'] = preg_replace('/^,+|,+$/', '', $iptc['keywords']); $iptc['keywords'] = implode( -- cgit v1.2.3