Changeset 48601

Timestamp:

07/24/2020 05:38:27 PM (4 years ago)

Author:

whyisjake

Message:

Mail: Ensure that a server hostname can be set by using network_home_url().

Due to the varying server setups, $_SERVER['SERVER_NAME']; can't reliably ensure that there will be a relevant host that could be used as the hostname in an email. Since the network_home_url() is set at this point, and is filterable, this should better enable emails to be sent from the server.

Fixes #25239.
Props layotte, SergeyBiryukov, nacin, sreedoap, szepe.viktor, jesin, kitchin, mensmaximus, mt8.biz, Grzegorz.Janoszka, cbutlerjr, dd32, BjornW, neodjandre, BjornW, Ipstenu, ocean90, danielbachhuber, desmith, joemcgill, jdgrimes, riasat, derekakelly, swissspidy, lilmike, tsimmons, robert.peake, DavidAnderson, cloudstek, pigdog234, BjornW, rawrly, pessoft, RedSand, seayou, dvershinin, bastho, chesio, Starbuck, afragen, ocean90, whyisjake.

Location:

trunk/src/wp-includes

Files:

• ms-functions.php (modified) (4 diffs)
• pluggable.php (modified) (3 diffs)

trunk/src/wp-includes/ms-functions.php

@@ -953 +953 @@
 
     if ( '' === $admin_email ) {
-        $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+        $admin_email = 'support@' . wp_parse_url( network_home_url(), PHP_URL_HOST );
     }
 
@@ -1080 +1080 @@
 
     if ( '' === $admin_email ) {
-        $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+        $admin_email = 'support@' . wp_parse_url( network_home_url(), PHP_URL_HOST );
     }
 
@@ -1664 +1664 @@
 
     if ( '' === $admin_email ) {
-        $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+        $admin_email = 'support@' . wp_parse_url( network_home_url(), PHP_URL_HOST );
     }
 
@@ -1756 +1756 @@
 
     if ( '' === $admin_email ) {
-        $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+        $admin_email = 'support@' . wp_parse_url( network_home_url(), PHP_URL_HOST );
     }
 

trunk/src/wp-includes/pluggable.php

@@ -331 +331 @@
         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 );
@@ -1651 +1651 @@
         }
 
-        $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 ) {
@@ -2832 +2832 @@
     }
 endif;
-