Changeset 10575

Timestamp:

02/15/2009 01:31:43 PM (16 years ago)

Author:

westi

Message:

Add documentation to detail reasoning for default from address. See #5007 props pishmishy

Location:

trunk

Files:

• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-includes/pluggable.php (modified) (2 diffs)

trunk/wp-admin/includes/upgrade.php

@@ -160 +160 @@
     $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:
 
@@ -176 +175 @@
 "), $blog_url, $name, $password);
 
-    @wp_mail($email, __('New WordPress Blog'), $message, $message_headers);
+    @wp_mail($email, __('New WordPress Blog'), $message);
 }
 endif;

trunk/wp-includes/pluggable.php

@@ -329 +329 @@
     }
 
-    // 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.
@@ -340 +346 @@
     }
 
-    // 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 );