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
This commit is contained in:
plegall 2012-02-10 13:57:11 +00:00
parent 9edfe9bbb9
commit 1a56352d08

View file

@ -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(