Ticket #28407: 28407.diff

wp-includes/pluggable.php

@@ -500 +500 @@
                         $phpmailer->AddCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
         }
 
-        if ( !empty( $attachments ) ) {
-                foreach ( $attachments as $attachment ) {
+        if ( !empty( $attachments ) && is_array( $attachments ) ) {     
+                // check if $attachments is associative array or not
+                $is_assoc_array = array_keys( $attachments ) !== range( 0, count( $attachments ) - 1 );
+                foreach ( $attachments as $name => $attachment ) {
                         try {
-                                $phpmailer->AddAttachment($attachment);
+                                ( $is_assoc_array ) ? $phpmailer->AddAttachment( $attachment, $name ) : $phpmailer->AddAttachment( $attachment );
                         } catch ( phpmailerException $e ) {
                                 continue;
                         }