Changeset 18006

Timestamp:

05/23/2011 11:14:05 AM (15 years ago)

Author:

westi

Message:

Update wp_mail to correctly call the Address adding functions on PHPMailer for To, CC, BCC in a way which preserves our support for full RFC2822 address specifications.
Older versions of PHPMailer were not too careful about validating what we passed in to them as a plain email address - the new version expects we pass in the Name and Email address seperately.
Fixes #17305 based on a patch from dllh.

File:

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

trunk/wp-includes/pluggable.php

@@ -297 +297 @@
                 }
                 $headers = array();
+                $cc = array();
+                $bcc = array();
 
                 // If it's actually got contents
@@ -402 +404 @@
         foreach ( (array) $to as $recipient ) {
                 try {
-                        $phpmailer->AddAddress( trim( $recipient ) );
+                        // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
+                        $recipient_name = '';
+                        if( preg_match( '/(.+)\s?<(.+)>/', $recipient, $matches ) ) {
+                                if ( count( $matches ) == 3 ) {
+                                        $recipient_name = $matches[1];
+                                        $recipient = $matches[2];
+                                }
+                        }
+                        $phpmailer->AddAddress( trim( $recipient ), $recipient_name);
                 } catch ( phpmailerException $e ) {
                         continue;
@@ -416 +426 @@
                 foreach ( (array) $cc as $recipient ) {
                         try {
-                                $phpmailer->AddCc( trim($recipient) );
+                                // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
+                                $recipient_name = '';
+                                if( preg_match( '/(.+)\s?<(.+)>/', $recipient, $matches ) ) {
+                                        if ( count( $matches ) == 3 ) {
+                                                $recipient_name = $matches[1];
+                                                $recipient = $matches[2];
+                                        }
+                                }
+                                $phpmailer->AddCc( trim($recipient), $recipient_name );
                         } catch ( phpmailerException $e ) {
                                 continue;
@@ -426 +444 @@
                 foreach ( (array) $bcc as $recipient) {
                         try {
-                                $phpmailer->AddBcc( trim($recipient) );
+                                // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
+                                $recipient_name = '';
+                                if( preg_match( '/(.+)\s?<(.+)>/', $recipient, $matches ) ) {
+                                        if ( count( $matches ) == 3 ) {
+                                                $recipient_name = $matches[1];
+                                                $recipient = $matches[2];
+                                        }
+                                }
+                                $phpmailer->AddBcc( trim($recipient), $recipient_name );
                         } catch ( phpmailerException $e ) {
                                 continue;