aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-07-20 23:55:08 +0000
committerrvelices <rv-github@modusoptimus.com>2006-07-20 23:55:08 +0000
commitd44aa8a1ed1397ba6364ea3f75aeece4a7b61cb3 (patch)
treec582997e27552e8309bc23de23a6c4d1e2983519
parent27aeab97e9fd04310e7c3fe2c7ba6325afbfb411 (diff)
merge -r1484:1485 from branch 1.6 to trunk (bug 481: Incorrect tag generation
in listing.xml for accentuated letters) git-svn-id: http://piwigo.org/svn/trunk@1486 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--tools/create_listing_file.php17
1 files changed, 9 insertions, 8 deletions
diff --git a/tools/create_listing_file.php b/tools/create_listing_file.php
index 377dba071..e5380e52b 100644
--- a/tools/create_listing_file.php
+++ b/tools/create_listing_file.php
@@ -136,7 +136,7 @@ function clean_iptc_value($value)
// remove binary nulls
$value = str_replace(chr(0x00), ' ', $value);
- return htmlentities($value);
+ return $value;
}
function get_sync_iptc_data($file)
@@ -154,17 +154,18 @@ function get_sync_iptc_data($file)
{
if ( preg_match('/(\d{4})(\d{2})(\d{2})/', $value, $matches))
{
- $iptc[$pwg_key] = $matches[1].'-'.$matches[2].'-'.$matches[3];
+ $value = $matches[1].'-'.$matches[2].'-'.$matches[3];
}
}
+ if ($pwg_key == 'keywords')
+ {
+ // official keywords separator is the comma
+ $value = preg_replace('/[.;]/', ',', $value);
+ $value = preg_replace('/^,+|,+$/', '', $value);
+ }
+ $iptc[$pwg_key] = htmlentities($value);
}
- if (isset($iptc['keywords']))
- {
- // official keywords separator is the comma
- $iptc['keywords'] = preg_replace('/[.;]/', ',', $iptc['keywords']);
- $iptc['keywords'] = preg_replace('/^,+|,+$/', '', $iptc['keywords']);
- }
$iptc['keywords'] = implode(
',',
array_unique(