aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-04-20 21:13:47 +0000
committerplegall <plg@piwigo.org>2006-04-20 21:13:47 +0000
commit7e13640ad12c0b7be2fa3fbcf68f7a7441cb999c (patch)
tree5b9e5d1bb6b7ac5e8af52e19adc499cf1229cfe4 /admin/include
parentc64da384ea354a194cfdcbd552340261b5d547d9 (diff)
merge -r1221:1222 from branch 1.6 to trunk (bug 339)
git-svn-id: http://piwigo.org/svn/trunk@1223 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/functions_metadata.php10
1 files changed, 10 insertions, 0 deletions
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
index 1df03ba43..f468ab7e3 100644
--- a/admin/include/functions_metadata.php
+++ b/admin/include/functions_metadata.php
@@ -53,6 +53,16 @@ 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'] = implode(
+ ',',
+ array_unique(
+ explode(
+ ',',
+ $iptc['keywords']
+ )
+ )
+ );
}
return $iptc;