WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix wp_mails handling of custom boundaries. Fixes #5204 props filosofo. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11136 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2009-04-30 07:25:47 +00:00
parent 0ca846c54d
commit b4743048ab
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wp-includes/pluggable.php
View File

@ -284,8 +284,13 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
if ( !empty( $tempheaders ) ) { if ( !empty( $tempheaders ) ) {
// Iterate through the raw headers // Iterate through the raw headers
foreach ( (array) $tempheaders as $header ) { foreach ( (array) $tempheaders as $header ) {
if ( strpos($header, ':') === false ) if ( strpos($header, ':') === false ) {
if ( false !== stripos( $header, 'boundary=' ) ) {
$parts = preg_split('/boundary=/i', trim( $header ) );
$boundary = trim( str_replace( array( "'", '"' ), '', $parts[1] ) );
}
continue; continue;
}
// Explode them out // Explode them out
list( $name, $content ) = explode( ':', trim( $header ), 2 ); list( $name, $content ) = explode( ':', trim( $header ), 2 );
@ -311,7 +316,12 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
if ( strpos( $content,';' ) !== false ) { if ( strpos( $content,';' ) !== false ) {
list( $type, $charset ) = explode( ';', $content ); list( $type, $charset ) = explode( ';', $content );
$content_type = trim( $type ); $content_type = trim( $type );
$charset = trim( str_replace( array( 'charset=', '"' ), '', $charset ) ); if ( false !== stripos( $charset, 'charset=' ) ) {
$charset = trim( str_replace( array( 'charset=', '"' ), '', $charset ) );
} elseif ( false !== stripos( $charset, 'boundary=' ) ) {
$boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset ) );
$charset = '';
}
} else { } else {
$content_type = trim( $content ); $content_type = trim( $content );
} }
@ -393,11 +403,11 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
$content_type = apply_filters( 'wp_mail_content_type', $content_type ); $content_type = apply_filters( 'wp_mail_content_type', $content_type );
$phpmailer->ContentType = $content_type;
// Set whether it's plaintext or not, depending on $content_type // Set whether it's plaintext or not, depending on $content_type
if ( $content_type == 'text/html' ) { if ( $content_type == 'text/html' ) {
$phpmailer->IsHTML( true ); $phpmailer->IsHTML( true );
} else {
$phpmailer->IsHTML( false );
} }
// If we don't have a charset from the input headers // If we don't have a charset from the input headers
@ -413,6 +423,9 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
foreach( (array) $headers as $name => $content ) { foreach( (array) $headers as $name => $content ) {
$phpmailer->AddCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) ); $phpmailer->AddCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
} }
if ( false !== stripos( $content_type, 'multipart' ) && ! empty($boundary) ) {
$phpmailer->AddCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
}
} }
if ( !empty( $attachments ) ) { if ( !empty( $attachments ) ) {