adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-31 05:53:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes #2093 handle new lines on metadata sync

Browse Source
This commit is contained in:
plegall
2024-01-29 19:27:47 +01:00
parent e59b5282d5
commit 4ea2996969
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/include/functions_metadata.php
+13
View File
@@ -233,6 +233,17 @@ function get_sync_metadata($infos)
$infos = array_merge($infos, $iptc); $infos = array_merge($infos, $iptc);
} }
foreach (array('name', 'author') as $single_line_field)
{
if (isset($infos[$single_line_field]))
{
foreach (array("\r\n", "\n") as $to_replace_string)
{
$infos[$single_line_field] = str_replace($to_replace_string, ' ', $infos[$single_line_field]);
}
}
}
return $infos; return $infos;
} }
@@ -393,6 +404,8 @@ function metadata_normalize_keywords_string($keywords_string)
global $conf; global $conf;
$keywords_string = preg_replace($conf['metadata_keyword_separator_regex'], ',', $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 = preg_replace('/,+/', ',', $keywords_string); $keywords_string = preg_replace('/,+/', ',', $keywords_string);
$keywords_string = preg_replace('/^,+|,+$/', '', $keywords_string); $keywords_string = preg_replace('/^,+|,+$/', '', $keywords_string);