Fixed issue #3918 where keywords separated with + are not unescaped correctly

00927b23 · Lukas Haemmerle · dd45f9fb · 00927b23
Commit 00927b23 authored Sep 13, 2019 by Lukas Haemmerle
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

lib/readMetadata.php lib/readMetadata.php +3 -1

No files found.
--- a/lib/readMetadata.php
+++ b/lib/readMetadata.php
@@ -499,7 +499,9 @@ function getMDUIKeywords($RoleDescriptorNode){
 	$MDUIKeywords = $RoleDescriptorNode->getElementsByTagNameNS('urn:oasis:names:tc:SAML:metadata:ui', 'Keywords');
 	foreach( $MDUIKeywords as $MDUIKeywordEntry ){
 		$lang = $MDUIKeywordEntry->getAttributeNodeNS('http://www.w3.org/XML/1998/namespace', 'lang')->nodeValue;
-		$Entity[$lang] = trimToSingleLine($MDUIKeywordEntry->nodeValue);
+		$keywordEntry = $MDUIKeywordEntry->nodeValue;
+		$keywordEntry = preg_replace('/\+/',' ',$keywordEntry);
+		$Entity[$lang] = trimToSingleLine($keywordEntry);
 	}
 	
 	return $Entity;