Changeset 49844

Timestamp:

12/20/2020 03:07:23 PM (4 years ago)

Author:

johnbillion

Message:

Mail: Introduce a pre_wp_mail filter to allow short-circuiting the wp_mail() function without having to override the pluggable function.

Props DvanKooten, swissspidy, SergeyBiryukov, jtsternberg, ericlewis, Mte90, birgire, ayeshrajans

Fixes #35069

Location:

trunk

Files:

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

trunk/src/wp-includes/pluggable.php

@@ -162 +162 @@
      * @global PHPMailer\PHPMailer\PHPMailer $phpmailer
      *
-     * @param string|array $to          Array or comma-separated list of email addresses to send message.
-     * @param string       $subject     Email subject
-     * @param string       $message     Message contents
-     * @param string|array $headers     Optional. Additional headers.
-     * @param string|array $attachments Optional. Paths to files to attach.
-     * @return bool Whether the email contents were sent successfully.
+     * @param string| $to          Array or comma-separated list of email addresses to send message.
+     * @param string       
+     * @param string       
+     * @param string| $headers     Optional. Additional headers.
+     * @param string| $attachments Optional. Paths to files to attach.
+     * @return bool Whether the email  sent successfully.
      */
     function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() ) {
@@ -188 +188 @@
          */
         $atts = apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
         if ( isset( $atts['to'] ) ) {

trunk/tests/phpunit/tests/mail.php

@@ -416 +416 @@
         $this->assertTrue( $phpmailer->validateAddress( 'foo@192.168.1.1' ), 'Assert PHPMailer accepts IP address email addresses' );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }