From 4ea29969699497b351543d120f478c053a59fafd Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 29 Jan 2024 19:27:47 +0100 Subject: [PATCH] fixes #2093 handle new lines on metadata sync --- admin/include/functions_metadata.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php index 2f63377ca..d992c128b 100644 --- a/admin/include/functions_metadata.php +++ b/admin/include/functions_metadata.php @@ -233,6 +233,17 @@ function get_sync_metadata($infos) $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; } @@ -393,6 +404,8 @@ function metadata_normalize_keywords_string($keywords_string) global $conf; $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);