Ticket #30128: 30128.patch

.php"

@@ -285 +285 @@
                 // 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 +333 @@
                                                 }
                                                 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