Ticket #25239: 25239.3.diff

src/wp-includes/ms-functions.php

@@ -952 +952 @@
         $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' ) ) ? esc_html( get_site_option( 'site_name' ) ) : 'WordPress';
@@ -1079 +1079 @@
         $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' ) ) ? esc_html( get_site_option( 'site_name' ) ) : 'WordPress';
@@ -1663 +1663 @@
         $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' ) ) ? esc_html( get_site_option( 'site_name' ) ) : 'WordPress';
@@ -1755 +1755 @@
         $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' ) ) ? esc_html( get_site_option( 'site_name' ) ) : 'WordPress';

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 ( 'www.' === substr( $sitename, 0, 4 ) ) {
                                 $sitename = substr( $sitename, 4 );
                         }
@@ -1650 +1650 @@
                         $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>";
@@ -2831 +2831 @@
                 return $r;
         }
 endif;
-