Ticket #40810: 40810 - getmxrr.diff

src/wp-includes/pluggable.php

@@ -329 +329 @@
                  */
 
                 if ( ! isset( $from_email ) ) {
-                        // Get the site domain and get rid of www.
-                        $sitename = strtolower( $_SERVER['SERVER_NAME'] );
-                        if ( substr( $sitename, 0, 4 ) == 'www.' ) {
-                                $sitename = substr( $sitename, 4 );
+                        // Loop through list of possible domain names, use the first one found.
+                        $urls = array( @$_SERVER['SERVER_NAME'], get_site_url(), get_home_url(), php_uname( 'n' ), 'localhost' );
+                        foreach ( $urls as $u ) {
+                                // Remove optional url scheme, port and path information.
+                                $u = preg_replace( '#^[^/]*//+([^/:]+).*$#', '\1', strtolower( $u ) );
+                                if ( ! empty( $u ) ) {
+                                        $sitename = $u;
+                                        // Found a domain name, now try to find a suitable mail server. This removes prefixes
+                                        // like `www.`, `staging.` and `dev.`.  If no server found, just use the full domain name.
+                                        while( ! empty($u) && strpos( $u, '.' ) !== false ) {
+                                                $hosts = array();
+                                                if ( getmxrr( $u, $hosts ) ) {
+                                                        $sitename = $u;
+                                                        break;
+                                                }
+                                                $u = preg_replace( '/^(.*?)\\./' , '' , $u );
+                                        }
+                                        break;
+                                }
                         }
 
                         $from_email = 'wordpress@' . $sitename;

tests/phpunit/tests/mail.php

@@ -360 +360 @@
                 $this->assertEquals( '', $mailer->Sender );
         }
 
+        /**
+         * Test that the From parameter has been set in phpmailer instance and not kept default.
+         * Even in the case when SERVER_NAME is not available.
+         *
+         * @ticket 40810
+         */
+        public function test_wp_mail_from_not_default() {
+                $_SERVER['SERVER_NAME'] = '';
+                wp_mail( 'user@example.org', 'Testing the From field', 'The From field should not be default.' );
+
+                $mailer = tests_retrieve_phpmailer_instance();
+
+                $this->assertNotEquals( 'root@localhost', $mailer->From );
+        }
+
         /**
          * @ticket 35598
          */