Ticket #40810: 40810.2.diff

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'] );
+                        // If SERVER_NAME is not available, hostname will be used.
+                        if ( ! empty( $_SERVER['SERVER_NAME'] ) ) {
+                                $sitename = strtolower( $_SERVER['SERVER_NAME'] );
+                        } else {
+                                $sitename = strtolower( php_uname( 'n' ) );
+                        }
                         if ( substr( $sitename, 0, 4 ) == 'www.' ) {
                                 $sitename = substr( $sitename, 4 );
                         }
@@ -984 +989 @@
          * Determines whether the current visitor is a logged in user.
          *
          * For more information on this and similar theme functions, check out
-         * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ 
+         * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
          * Conditional Tags} article in the Theme Developer Handbook.
-         * 
+         *
          * @since 2.0.0
          *
          * @return bool True if user is logged in, false if not logged in.

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
          */