Changeset 38286

Timestamp:

08/20/2016 02:16:54 AM (8 years ago)

Author:

boonebgorges

Message:

Mail: Don't set Sender field when setting From.

[38058] changed wp_mail() so that it used PHPMailer's setFrom()
method rather than setting the From and FromName headers directly. See
behavior of setting the Sender field. This causes mail to be
called with the -f flag, which causes outgoing email to fail on some
server environments.

Props Clorith, iandunn, DrewAPicture.
Fixes #37736.

Location:

trunk

Files:

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

trunk/src/wp-includes/pluggable.php

@@ -350 +350 @@
     $from_name = apply_filters( 'wp_mail_from_name', $from_name );
 
-    $phpmailer->setFrom( $from_email, $from_name );
+    $phpmailer->setFrom( $from_email, $from_name, false );
 
     // Set destination addresses

trunk/tests/phpunit/tests/mail.php

@@ -343 +343 @@
         }
     }
+
+    /**
+     * 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( 'user@example.org', 'Testing the Sender field', 'The Sender field should not have been set.' );
+
+        $mailer = tests_retrieve_phpmailer_instance();
+
+        $this->assertEquals( '', $mailer->Sender );
+    }
 }