Ticket #25239: 25239.r44770.patch

src/wp-includes/ms-functions.php

@@ -913 +913 @@
         $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@' . wp_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";
@@ -1036 +1036 @@
         // Send email with activation link.
         $admin_email = get_site_option( 'admin_email' );
         if ( $admin_email == '' ) {
-                $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+                $admin_email = 'support@' . wp_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";
@@ -1586 +1586 @@
         $admin_email   = get_site_option( 'admin_email' );
 
         if ( $admin_email == '' ) {
-                $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+                $admin_email = 'support@' . wp_parse_url( network_home_url(), PHP_URL_HOST );
         }
 
         $from_name       = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
@@ -1677 +1677 @@
         $admin_email = get_site_option( 'admin_email' );
 
         if ( $admin_email == '' ) {
-                $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+                $admin_email = 'support@' . wp_parse_url( network_home_url(), PHP_URL_HOST );
         }
 
         $from_name       = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );

src/wp-includes/pluggable.php

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