From fa9c62915f30b4a314b59ea5178d35ce9d93006d Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Tue, 16 Aug 2022 18:18:14 +0000
Subject: [PATCH] =?UTF-8?q?Mail:=20Prevent=20the=20last=20character=20of?=
 =?UTF-8?q?=20names=20in=20=20=E2=80=9CFrom=E2=80=9D=20headers=20from=20be?=
 =?UTF-8?q?ing=20trimmed.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When extracting the email and name from a “From” header, the last character of the name is incorrectly trimmed when a space is not included between the name and the opening `<`.

Though the space is required for the header to be compliant with RFC5322 (see https://www.rfc-editor.org/rfc/rfc5322#section-3.4), the absence of a space can be ignored here. PHPMailer accepts the name and email as separate parameters and constructs the header correctly later on.

Props hakanca, mikehansenme, SergeyBiryukov, kovshenin, mattyrob, drewapicture, desrosj.
Fixes #19847.
Built from https://develop.svn.wordpress.org/trunk@53900


git-svn-id: http://core.svn.wordpress.org/trunk@53459 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/pluggable.php | 2 +-
 wp-includes/version.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 2ec21126e0..5ab3eef749 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -307,7 +307,7 @@ if ( ! function_exists( 'wp_mail' ) ) :
 							if ( false !== $bracket_pos ) {
 								// Text before the bracketed email is the "From" name.
 								if ( $bracket_pos > 0 ) {
-									$from_name = substr( $content, 0, $bracket_pos - 1 );
+									$from_name = substr( $content, 0, $bracket_pos );
 									$from_name = str_replace( '"', '', $from_name );
 									$from_name = trim( $from_name );
 								}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e65411e4c3..c4e7f9cd18 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-alpha-53899';
+$wp_version = '6.1-alpha-53900';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.