Ticket #25239: 25239.7.diff

src/wp-includes/ms-functions.php

@@ -838 +838 @@
         $activate_url = esc_url($activate_url);
         $admin_email = get_site_option( 'admin_email' );
         if ( $admin_email == '' )
-                $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+                $admin_email = 'support@' . parse_url( network_home_url(), PHP_URL_HOST );
         $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";
 
@@ -944 +944 @@
         // Send email with activation link.
         $admin_email = get_site_option( 'admin_email' );
         if ( $admin_email == '' )
-                $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+                $admin_email = 'support@' . parse_url( network_home_url(), PHP_URL_HOST );
         $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(
@@ -1563 +1563 @@
         $admin_email = get_site_option( 'admin_email' );
 
         if ( $admin_email == '' )
-                $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+                $admin_email = 'support@' . parse_url( network_home_url(), PHP_URL_HOST );
 
         $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";
@@ -1651 +1651 @@
         $admin_email = get_site_option( 'admin_email' );
 
         if ( $admin_email == '' )
-                $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+                $admin_email = 'support@' . parse_url( network_home_url(), PHP_URL_HOST );
 
         $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

@@ -327 +327 @@
 
         if ( !isset( $from_email ) ) {
                 // Get the site domain and get rid of www.
-                $sitename = strtolower( $_SERVER['SERVER_NAME'] );
+                $sitename = parse_url( network_home_url(), PHP_URL_HOST );
                 if ( substr( $sitename, 0, 4 ) == 'www.' ) {
                         $sitename = substr( $sitename, 4 );
                 }
@@ -1506 +1506 @@
                 $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']));
+        $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', parse_url( network_home_url(), PHP_URL_HOST ));
 
         if ( '' == $comment->comment_author ) {
                 $from = "From: \"$blogname\" <$wp_email>";