Ticket #25239: 25239.2.diff

src/wp-includes/ms-functions.php

@@ -796 +796 @@
 
         $activate_url = esc_url($activate_url);
         $admin_email = get_site_option( 'admin_email' );
-        if ( $admin_email == '' )
-                $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+        if ( $admin_email == '' ) {
+                global $current_site;
+                $admin_email = 'support@' . $current_site->domain;
+        }
         $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
         $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = sprintf(
@@ -889 +891 @@
 
         // Send email with activation link.
         $admin_email = get_site_option( 'admin_email' );
-        if ( $admin_email == '' )
-                $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+        if ( $admin_email == '' ) {
+                global $current_site;
+                $admin_email = 'support@' . $current_site->domain;
+        }
         $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
         $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = sprintf(
@@ -1490 +1494 @@
         $welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
         $admin_email = get_site_option( 'admin_email' );
 
-        if ( $admin_email == '' )
-                $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+        if ( $admin_email == '' ) {
+                $admin_email = 'support@' . $current_site->domain;
+        }
 
         $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
         $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
@@ -1569 +1574 @@
 
         $admin_email = get_site_option( 'admin_email' );
 
-        if ( $admin_email == '' )
-                $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+        if ( $admin_email == '' ) {
+                $admin_email = 'support@' . $current_site->domain;
+        }
 
         $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
         $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";

src/wp-includes/pluggable.php

@@ -323 +323 @@
 
         if ( !isset( $from_email ) ) {
                 // Get the site domain and get rid of www.
-                $sitename = strtolower( $_SERVER['SERVER_NAME'] );
+                if ( is_multisite() ) {
+                        global $current_blog;
+                        $sitename = $current_blog->domain;
+                } else {
+                        $sitename = parse_url( home_url(), PHP_URL_HOST );
+                }
                 if ( substr( $sitename, 0, 4 ) == 'www.' ) {
                         $sitename = substr( $sitename, 4 );
                 }
@@ -1466 +1471 @@
                 $notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
         }
 
-        $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
+        if ( is_multisite() ) {
+                global $current_blog;
+                $sitename = $current_blog->domain;
+        } else {
+                $sitename = parse_url( home_url(), PHP_URL_HOST );
+        }
+        $wp_email = 'wordpress@' . preg_replace( '#^www\.#', '', $sitename );
 
         if ( '' == $comment->comment_author ) {
                 $from = "From: \"$blogname\" <$wp_email>";