iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge -r1484:1485 from branch 1.6 to trunk (bug 481: Incorrect tag generation

Browse Source 
in listing.xml for accentuated letters)

git-svn-id: http://piwigo.org/svn/trunk@1486 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2006-07-20 23:55:08 +00:00
parent 27aeab97e9
commit d44aa8a1ed
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/create_listing_file.php
View File

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