Ticket #5007: 5007.2.patch

wp-includes/pluggable.php

@@ -336 +336 @@
                 $from_name = 'WordPress';
         }
 
-        // If we don't have an email from the input headers
+        /* If we don't have an email from the input headers default to wordpress@$sitename
+         * Some hosts will block outgoing mail from this address if it doesn't exist but
+         * there's no easy alternative. Defaulting to admin_email might appear to be another 
+         * option but some hosts may refuse to relay mail from an unknown domain. See
+         * http://trac.wordpress.org/ticket/5007.
+         */
+        
         if ( !isset( $from_email ) ) {
                 // Get the site domain and get rid of www.
                 $sitename = strtolower( $_SERVER['SERVER_NAME'] );
@@ -347 +353 @@
                 $from_email = 'wordpress@' . $sitename;
         }
 
-        // Set the from name and email
+        // Plugin authors can override the potentially troublesome default
         $phpmailer->From = apply_filters( 'wp_mail_from', $from_email );
         $phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name );
 

wp-admin/includes/upgrade.php

@@ -115 +115 @@
         $user = new WP_User($user_id);
         $email = $user->user_email;
         $name = $user->user_login;
-        $message_headers = 'From: "' . $blog_title . '" <wordpress@' . $_SERVER['SERVER_NAME'] . '>';
         $message = sprintf(__("Your new WordPress blog has been successfully set up at:
 
 %1\$s