unicodeTrim: Combine suffix and prefix matching

jtojnar · jtojnar · commit a2c7c44d924e · 2025-10-04T04:32:16.000+02:00
diff --git a/Mf2/Parser.php b/Mf2/Parser.php
@@ -113,8 +113,7 @@ function collapseWhitespace($str) {
 function unicodeTrim($str) {
 	// this is cheating. TODO: find a better way if this causes any problems
 	$str = str_replace(mb_convert_encoding('&nbsp;', 'UTF-8', 'HTML-ENTITIES'), ' ', $str);
-	$str = preg_replace('/^\s+/', '', $str);
-	return preg_replace('/\s+$/', '', $str);
+	return preg_replace('/^\s+|\s+$/', '', $str);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -113,8 +113,7 @@ function collapseWhitespace($str) {`
`113`	`113`	`function unicodeTrim($str) {`
`114`	`114`	`// this is cheating. TODO: find a better way if this causes any problems`
`115`	`115`	`$str = str_replace(mb_convert_encoding(' ', 'UTF-8', 'HTML-ENTITIES'), ' ', $str);`
`116`		`- $str = preg_replace('/^\s+/', '', $str);`
`117`		`- return preg_replace('/\s+$/', '', $str);`
	`116`	`+ return preg_replace('/^\s+\|\s+$/', '', $str);`
`118`	`117`	`}`
`119`	`118`
`120`	`119`	`/**`