Ticket #47822: 47822.diff

src/wp-includes/formatting.php

@@ -5694 +5694 @@
                 return $mail;
         }
 
+        if( isset( $mail['convert_symbols'] ) && FALSE === $mail['convert_symbols'] ) {
+                return $mail;
+        }
+
         /*
          * We can only transform the emoji into images if it's a text/html email.
          * To do that, here's a cut down version of the same process that happens

src/wp-includes/pluggable.php

@@ -165 +165 @@
          * @param string       $message     Message contents
          * @param string|array $headers     Optional. Additional headers.
          * @param string|array $attachments Optional. Files to attach.
+         * @param bool $convert_symbols Optional. Passes to 'wp_mail' filter.
          * @return bool Whether the email contents were sent successfully.
          */
-        function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() ) {
+        function wp_mail( $to, $subject, $message, $headers = '', $attachments = array(), $convert_symbols = TRUE ) {
                 // Compact the input, apply the filters, and extract them back out
 
                 /**
@@ -178 +179 @@
                  * @param array $args A compacted array of wp_mail() arguments, including the "to" email,
                  *                    subject, message, headers, and attachments values.
                  */
-                $atts = apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) );
+                $atts = apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments', 'convert_symbols' ) );
 
                 if ( isset( $atts['to'] ) ) {
                         $to = $atts['to'];