Fix replacing of invalid XML characters

rombert · rombert · commit 7ae2d9ae629b · 2012-11-15T22:01:22.000+02:00
Fixes #14157: Array to string conversion error on soap request with PHP
5.4
diff --git a/api/soap/mc_api.php b/api/soap/mc_api.php
@@ -305,7 +305,7 @@ function mci_null_if_empty( $p_value ) {
  */
 function mci_sanitize_xml_string ( $p_input ) {
 	
-	return preg_replace( '/[^\x9\xA\xD\x20-\xD7FF\xE000-\xFFFD\x{10000}-\x{10FFFF}]/u', '', $p_input);
+	return preg_replace( '/[^\x9\xA\xD\x20-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]+/u', '', $p_input);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ function mci_null_if_empty( $p_value ) {`
`305`	`305`	`*/`
`306`	`306`	`function mci_sanitize_xml_string ( $p_input ) {`
`307`	`307`
`308`		`- return preg_replace( '/[^\x9\xA\xD\x20-\xD7FF\xE000-\xFFFD\x{10000}-\x{10FFFF}]/u', '', $p_input);`
	`308`	`+ return preg_replace( '/[^\x9\xA\xD\x20-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]+/u', '', $p_input);`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`/**`