The Weston's Regex

SirLouen · SirLouen · commit 1fd5ac926041 · 2025-11-05T14:51:10.000+01:00
diff --git a/src/wp-includes/pluggable.php b/src/wp-includes/pluggable.php
@@ -351,7 +351,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 								} elseif ( false !== stripos( $charset_content, 'boundary=' ) ) {
 									$boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset_content ) );
 									$charset  = '';
-									if ( preg_match( '~multipart/([a-z]+)~i', $content_type, $matches ) ) {
+									if ( preg_match( '~^multipart/(\S+)~', $content_type, $matches ) ) {
 										$content_type = 'multipart/' . strtolower( $matches[1] ) . '; boundary="' . $boundary . '"';
 									}
 								}

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()`
`351`	`351`	`} elseif ( false !== stripos( $charset_content, 'boundary=' ) ) {`
`352`	`352`	`$boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset_content ) );`
`353`	`353`	`$charset = '';`
`354`		`- if ( preg_match( '~multipart/([a-z]+)~i', $content_type, $matches ) ) {`
	`354`	`+ if ( preg_match( '~^multipart/(\S+)~', $content_type, $matches ) ) {`
`355`	`355`	`$content_type = 'multipart/' . strtolower( $matches[1] ) . '; boundary="' . $boundary . '"';`
`356`	`356`	`}`
`357`	`357`	`}`