Ticket #1352: 1352.diff

wp-includes/pluggable.php

@@ -161 +161 @@
 if ( !function_exists('wp_mail') ) :
 function wp_mail($to, $subject, $message, $headers = '') {
         if( $headers == '' ) {
-                $headers = "MIME-Version: 1.0\n" .
-                        "From: wordpress@" . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME'])) . "\n" . 
-                        "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+                $headers = 'MIME-Version: 1.0\n' .
+                        'From: "' . sanitize_email(get_option('blogname')) . '" <wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME'])) . '>\n' . 
+                        'Content-Type: text/plain; charset="' . get_option('blog_charset') . '"\n';
         }
 
         return @mail($to, $subject, $message, $headers);