Changeset 28425

Timestamp:

05/15/2014 06:16:34 AM (12 years ago)

Author:

wonderboymusic

Message:

Eliminate the use of extract() in wp_mail(). Check the filtered array for each value before re-setting variables.

See #22400.

File:

• trunk/src/wp-includes/pluggable.php (modified) (1 diff)

trunk/src/wp-includes/pluggable.php

@@ -234 +234 @@
          *                    subject, message, headers, and attachments values.
          */
-        extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) ) );
-
-        if ( !is_array($attachments) )
+        $atts = apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) );
+
+        if ( isset( $atts['to'] ) ) {
+                $to = $atts['to'];
+        }
+
+        if ( isset( $atts['subject'] ) ) {
+                $subject = $atts['subject'];
+        }
+
+        if ( isset( $atts['message'] ) ) {
+                $message = $atts['message'];
+        }
+
+        if ( isset( $atts['headers'] ) ) {
+                $headers = $atts['headers'];
+        }
+
+        if ( isset( $atts['attachments'] ) ) {
+                $attachments = $atts['attachments'];
+        }
+
+        if ( ! is_array( $attachments ) ) {
                 $attachments = explode( "\n", str_replace( "\r\n", "\n", $attachments ) );
-
+        }
         global $phpmailer;