Ticket #25239: 25239.patch

trunk/wp-includes/default-constants.php

@@ -133 +133 @@
         define( 'MONTH_IN_SECONDS', 30 * DAY_IN_SECONDS );
         define( 'YEAR_IN_SECONDS', 365 * DAY_IN_SECONDS );
         /**#@-*/
+
+        /**
+         * Determines if PHPMailer->setFrom() will be called with auto Sender to true or false
+         * If set to true, php mail function will be call with the -f option 
+         *
+         * @since 5.0
+         */
+        if ( ! defined( 'WP_MAIL_AUTO_SENDER' ) ) {
+                define( 'WP_MAIL_AUTO_SENDER', false ); // boolean
+        }
 }
 
 /**

trunk/wp-includes/pluggable.php

@@ -357 +357 @@
                 $from_name = apply_filters( 'wp_mail_from_name', $from_name );
 
                 try {
-                        $phpmailer->setFrom( $from_email, $from_name, false );
+                        $phpmailer->setFrom( $from_email, $from_name, WP_MAIL_AUTO_SENDER );
                 } catch ( phpmailerException $e ) {
                         $mail_error_data                             = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
                         $mail_error_data['phpmailer_exception_code'] = $e->getCode();