Changeset 18717

Timestamp:

09/19/2011 02:30:50 PM (15 years ago)

Author:

westi

Message:

Improve the parsing of email addresses in wp_mail to re-support RFC2822 nameless "<address@…>" style. Fixes #18463 props kitchin and SergeyBiryukov.

File:

• trunk/wp-includes/pluggable.php (modified) (6 diffs)

trunk/wp-includes/pluggable.php

@@ -339 +339 @@
                         // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
                         $recipient_name = '';
-                        if( preg_match( '/(.+)\s?<(.+)>/', $recipient, $matches ) ) {
+                        if( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
                                 if ( count( $matches ) == 3 ) {
                                         $recipient_name = $matches[1];
@@ -345 +345 @@
                                 }
                         }
-                        $phpmailer->AddAddress( trim( $recipient ), $recipient_name);
+                        $phpmailer->AddAddress( $recipient, $recipient_name);
                 } catch ( phpmailerException $e ) {
                         continue;
@@ -361 +361 @@
                                 // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
                                 $recipient_name = '';
-                                if( preg_match( '/(.+)\s?<(.+)>/', $recipient, $matches ) ) {
+                                if( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
                                         if ( count( $matches ) == 3 ) {
                                                 $recipient_name = $matches[1];
@@ -367 +367 @@
                                         }
                                 }
-                                $phpmailer->AddCc( trim($recipient), $recipient_name );
+                                $phpmailer->AddCc( $recipient, $recipient_name );
                         } catch ( phpmailerException $e ) {
                                 continue;
@@ -379 +379 @@
                                 // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
                                 $recipient_name = '';
-                                if( preg_match( '/(.+)\s?<(.+)>/', $recipient, $matches ) ) {
+                                if( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
                                         if ( count( $matches ) == 3 ) {
                                                 $recipient_name = $matches[1];
@@ -385 +385 @@
                                         }
                                 }
-                                $phpmailer->AddBcc( trim($recipient), $recipient_name );
+                                $phpmailer->AddBcc( $recipient, $recipient_name );
                         } catch ( phpmailerException $e ) {
                                 continue;