Changeset 61549

Timestamp:

01/28/2026 09:15:37 PM (3 weeks ago)

Author:

jorbin

Message:

Mail: Revert Set sender address by default.

This reverts [61010]. Setting the sender address by default has shown to reduce deliverability for emails for sites that were working correctly in 6.8 and before. As reduced deliverability can harm IP reputation which means it's not just the single WordPress install that is harmed, [61010] is being reverted out of an abundance of caution.

Follow up to [61010].

Reviewed by audrasjb, wildworks.
Merges [61537] to the 6.9 branch.

Props jorbin, dmsnell, SirLouen, wildworks, desrosj, siliconforks, digitalblanket, studiomondiale, zoe20, Monarobase, amanandhishoe,
Fixes #64368.See #49687.

Location:

branches/6.9

Files:

• . (modified) (1 prop)
• src/wp-includes/pluggable.php (modified) (1 diff)
• tests/phpunit/tests/pluggable/wpMail.php (modified) (1 diff)

branches/6.9/src/wp-includes/pluggable.php

@@ -445 +445 @@
 
         try {
-            $phpmailer->setFrom( $from_email, $from_name );
+            $phpmailer->setFrom( $from_email, $from_name, false );
         } catch ( PHPMailer\PHPMailer\Exception $e ) {
             $mail_error_data                             = compact( 'to', 'subject', 'message', 'headers', 'attachments' );

branches/6.9/tests/phpunit/tests/pluggable/wpMail.php

@@ -412 +412 @@
 
     /**
-     * Test that the Sender field in the SMTP envelope is set by Core.
-     *
-     * A missing Sender field can lead to messages failing DMARC SPF checks.
-     *
-     * @ticket 49687
-     */
-    public function test_wp_mail_sender_set() {
-        wp_mail( '[email protected]', 'Testing the Sender field', 'The Sender field should have been set.' );
-
-        $mailer = tests_retrieve_phpmailer_instance();
-
-        $this->assertSame( '[email protected]', $mailer->Sender );
+     * Test that the Sender field in the SMTP envelope is not set by Core.
+     *
+     * Correctly setting the Sender requires knowledge that is not available
+     * to Core. An incorrect value will often lead to messages being rejected
+     * by the receiving MTA, so it's the admin's responsibility to
+     * set it correctly.
+     *
+     * @ticket 37736
+     */
+    public function test_wp_mail_sender_not_set() {
+        wp_mail( '[email protected]', 'Testing the Sender field', 'The Sender field should not have been set.' );
+
+        $mailer = tests_retrieve_phpmailer_instance();
+
+        $this->assertSame( '', $mailer->Sender );
     }