WordPress.org

Make WordPress Core

Ticket #5007: 5007.patch

File 5007.patch, 975 bytes (added by pishmishy, 8 years ago)

Standardizes sender address to admin_email

  • wp-includes/pluggable.php

     
    235235                        $sitename = substr( $sitename, 4 ); 
    236236                } 
    237237 
    238                 $from_email = 'wordpress@' . $sitename; 
     238                $from_email = get_option('admin_email'); 
    239239        } 
    240240 
    241241        // Set the from name and email 
  • wp-admin/includes/upgrade.php

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