Ticket #4511: wp_mail_extr_skip.diff

wp-includes/pluggable.php

@@ -158 +158 @@
 
 if ( !function_exists( 'wp_mail' ) ) :
 function wp_mail( $to, $subject, $message, $headers = '' ) {
+        // Compact the input, apply the filters, and extract them back out
+        extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers' ) ) );
+
         global $phpmailer;
 
         // (Re)create it, if it's gone missing
@@ -167 +170 @@
                 $phpmailer = new PHPMailer();
         }
 
-        // Compact the input, apply the filters, and extract them back out
-        extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers' ) ), EXTR_SKIP );
-
         // Default headers
         if ( empty( $headers ) ) {
                 $headers = array(