Ticket #30128: 30128.path

diff --git "a/C:\\Users\\user\\AppData\\Local\\Temp\\TortoiseGit\\plu9CA5.tmp\\pluggable-fcf8769-left.php" "b/C:\\Users\\user\\Dropbox\\webmasterka\\wordpress\\wp-includes\\pluggable.php"
index 0f9e5a3..c93e6ff 100644
--- "a/C:\\Users\\user\\AppData\\Local\\Temp\\TortoiseGit\\plu9CA5.tmp\\pluggable-fcf8769-left.php"
+++ "b/C:\\Users\\user\\Dropbox\\webmasterka\\wordpress\\wp-includes\\pluggable.php"
@@ -285,16 +285,18 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
                // If it's actually got contents
                if ( !empty( $tempheaders ) ) {
                        // Iterate through the raw headers
-                       foreach ( (array) $tempheaders as $header ) {
+                       foreach ( (array) $tempheaders as $key => $header ) {
                                if ( strpos($header, ':') === false ) {
                                        if ( false !== stripos( $header, 'boundary=' ) ) {
                                                $parts = preg_split('/boundary=/i', trim( $header ) );
                                                $boundary = trim( str_replace( array( "'", '"' ), '', $parts[1] ) );
                                        }
-                                       continue;
+                                       if ( is_numeric ( $key ) ) {
+                                               continue;
+                                       }
                                }
                                // Explode them out
-                               list( $name, $content ) = explode( ':', trim( $header ), 2 );
+                               list( $name, $content ) = ( is_numeric ( $key ) ) ? explode( ':', trim( $header ), 2 ) : array ( $key, $header );
 
                                // Cleanup crew
                                $name    = trim( $name    );
@@ -331,10 +333,16 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
                                                }
                                                break;
                                        case 'cc':
-                                               $cc = array_merge( (array) $cc, explode( ',', $content ) );
+                                               $cc = array_merge(
+                                                       (array) $cc,
+                                                       ( is_array ( $content ) ) ? $content : explode( ',', $content )
+                                               );
                                                break;
                                        case 'bcc':
-                                               $bcc = array_merge( (array) $bcc, explode( ',', $content ) );
+                                               $bcc = array_merge(
+                                                       (array) $bcc,
+                                                       ( is_array ( $content ) ) ? $content : explode( ',', $content )
+                                               );
                                                break;
                                        default:
                                                // Add it to our grand headers array