Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-22 16:21:26 +01:00
Code Issues Projects Releases Wiki Activity

Newline regression - http://mosquito.wordpress.org/view.php?id=263 - Hat tip: mlittle

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@2607 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
matt 2005-05-14 00:22:30 +00:00
parent b6cbe98881
commit 434ee3acd5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/pluggable-functions.php
View File

@ -60,9 +60,9 @@ endif;
if ( !function_exists('wp_mail') ) : if ( !function_exists('wp_mail') ) :
function wp_mail($to, $subject, $message, $headers = '') { function wp_mail($to, $subject, $message, $headers = '') {
if( $headers == '' ) { if( $headers == '' ) {
$headers = "MIME-Version: 1.0\r\n" . $headers = "MIME-Version: 1.0\n" .
"From: " . get_settings('admin_email') . "\r\n" . "From: " . get_settings('admin_email') . "\n" .
"Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\r\n"; "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n";
} }
return @mail($to, $subject, $message, $headers); return @mail($to, $subject, $message, $headers);
@ -216,9 +216,9 @@ function wp_notify_postauthor($comment_id, $comment_type='') {
$from = 'From: "' . $comment->comment_author . "\" <$comment->comment_author_email>"; $from = 'From: "' . $comment->comment_author . "\" <$comment->comment_author_email>";
} }
$message_headers = "MIME-Version: 1.0\r\n" $message_headers = "MIME-Version: 1.0\n"
. "$from\r\n" . "$from\n"
. "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\r\n"; . "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n";
@wp_mail($user->user_email, $subject, $notify_message, $message_headers); @wp_mail($user->user_email, $subject, $notify_message, $message_headers);