Ticket #21659: 21659.diff

src/wp-includes/pluggable.php

@@ -248 +248 @@
                         $tempheaders = $headers;
                 }
                 $headers = array();
-                $cc = array();
-                $bcc = array();
+                $cc = $bcc = $reply_to = array();
 
                 // If it's actually got contents
                 if ( !empty( $tempheaders ) ) {
@@ -305 +304 @@
                                         case 'bcc':
                                                 $bcc = array_merge( (array) $bcc, explode( ',', $content ) );
                                                 break;
+                                        case 'reply-to':
+                                                $reply_to = array_merge( (array) $reply_to, explode( ',', $content ) );
+                                                break;
                                         default:
                                                 // Add it to our grand headers array
                                                 $headers[trim( $name )] = trim( $content );
@@ -370 +372 @@
         $phpmailer->Subject = $subject;
         $phpmailer->Body    = $message;
 
-        // Add any CC and BCC recipients
-        if ( !empty( $cc ) ) {
-                foreach ( (array) $cc as $recipient ) {
-                        try {
-                                // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
-                                $recipient_name = '';
-                                if( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
-                                        if ( count( $matches ) == 3 ) {
-                                                $recipient_name = $matches[1];
-                                                $recipient = $matches[2];
-                                        }
+        // Add any CC, BCC, and Reply-To recipients
+        $recipient_headers = array(
+                // map the header names to the corresponding PHPMailer method for adding them to the message
+                'cc'       => 'AddCc',
+                'bcc'      => 'AddBcc',
+                'reply_to' => 'AddReplyTo'
+        );
+        
+        foreach ( $recipient_headers as $recipient_header => $add_method ) {
+                if ( ! empty( $$recipient_header ) ) {
+                        foreach ( $$recipient_header as $recipient ) {
+                                try {
+                                        // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
+                                        $recipient_name = '';
+                                        if( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
+                                                if ( count( $matches ) == 3 ) {
+                                                        $recipient_name = $matches[1];
+                                                        $recipient = $matches[2];
+                                                }
+                                        }               
+                                        call_user_func( array( $phpmailer, $add_method ), $recipient, $recipient_name );
+                                } catch ( phpmailerException $e ) {
+                                        continue;
                                 }
-                                $phpmailer->AddCc( $recipient, $recipient_name );
-                        } catch ( phpmailerException $e ) {
-                                continue;
                         }
                 }
         }
 
-        if ( !empty( $bcc ) ) {
-                foreach ( (array) $bcc as $recipient) {
-                        try {
-                                // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
-                                $recipient_name = '';
-                                if( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
-                                        if ( count( $matches ) == 3 ) {
-                                                $recipient_name = $matches[1];
-                                                $recipient = $matches[2];
-                                        }
-                                }
-                                $phpmailer->AddBcc( $recipient, $recipient_name );
-                        } catch ( phpmailerException $e ) {
-                                continue;
-                        }
-                }
-        }
-
         // Set to use PHP's mail()
         $phpmailer->IsMail();