General: prevent antispambot() from breaking UTF8 strings.

WordPress · Dec 2, 2024 · cef6fe4 · cef6fe4
1 parent 669bcce
commit cef6fe4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php
@@ -3016,7 +3016,9 @@ function antispambot( $email_address, $hex_encoding = 0 ) {
 	for ( $i = 0, $len = strlen( $email_address ); $i < $len; $i++ ) {
 		$j = rand( 0, 1 + $hex_encoding );
 
-		if ( 0 === $j ) {
+		if ( ord( $email_address[ $i ] ) > 127 ) {
+			$email_no_spam_address .= $email_address[ $i ];
+		} elseif ( 0 === $j ) {
 			$email_no_spam_address .= '&#' . ord( $email_address[ $i ] ) . ';';
 		} elseif ( 1 === $j ) {
 			$email_no_spam_address .= $email_address[ $i ];

diff --git a/tests/phpunit/tests/formatting/antispambot.php b/tests/phpunit/tests/formatting/antispambot.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @group formatting
+ *
+ * @covers ::antispambot
+ */
+class Tests_Formatting_antispambot extends WP_UnitTestCase {
+	public function test_returns_valid_utf8() {
+		$data = array(
+			'[email protected]',
+			'[email protected]',
+			'[email protected]',
+			'[email protected]',
+			'[email protected]',
+			'[email protected]',
+			'info@grå.org',
+			'grå@grå.org',
+			"gr\u{0061}\u{030a}blå@grå.org",
+			'[email protected]',
+		);
+		foreach ( $data as $datum ) {
+			$this->assertTrue( seems_utf8( antispambot( $datum ) ) );
+		}
+	}
+}