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
Piwigo · Feb 10, 2012 · 1a56352 · 1a56352
1 parent 9edfe9b
commit 1a56352
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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(