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

(cp f270e82a0) fixes #2408 add CR as line end (Classic Mac Os) to split IPTC keywords

Browse Source
This commit is contained in:
plegall
2025-09-10 19:21:24 +02:00
parent c48d201dc2
commit 2148a1cb22
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/include/functions_metadata.php
View File

@@ -243,7 +243,7 @@ function get_sync_metadata($infos)
{
if (isset($infos[$single_line_field]))
{
foreach (array("\r\n", "\n") as $to_replace_string)
foreach (array("\r\n", "\n", "\r") as $to_replace_string)
{
$infos[$single_line_field] = str_replace($to_replace_string, ' ', $infos[$single_line_field]);
}
@@ -411,7 +411,7 @@ function metadata_normalize_keywords_string($keywords_string)
$keywords_string = preg_replace($conf['metadata_keyword_separator_regex'], ',', $keywords_string);
// new lines are always considered as keyword separators
$keywords_string = str_replace(array("\r\n", "\n"), ',', $keywords_string);
$keywords_string = str_replace(array("\r\n", "\n", "\r"), ',', $keywords_string);
$keywords_string = preg_replace('/,+/', ',', $keywords_string);
$keywords_string = preg_replace('/^,+|,+$/', '', $keywords_string);