Changeset 55030 for trunk/src/wp-includes/pluggable.php

Timestamp:

01/05/2023 10:47:06 AM (4 years ago)

Author:

johnjamesjacoby

Message:

Mail: allow custom attachment filenames in wp_mail().

Previous to this change, attachment filenames in outgoing emails could only ever be derived from their paths (passed in as a numerically indexed array of $attachments).

This changeset adds support for passing an associative $attachments array, where the key strings will be used as filenames instead.

Includes 2 new unit tests to ensure both array formats continue to work as intended.

Props johnjamesjacoby, ritteshpatel, swissspidy, syntaxart.
Fixes #28407.

File:

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

trunk/src/wp-includes/pluggable.php

@@ -518 +518 @@
 
                 if ( ! empty( $attachments ) ) {
-                        foreach ( $attachments as $attachment ) {
+                        foreach ( $attachments as $filename => $attachment ) {
+                                $filename = is_string( $filename ) ? $filename : '';
+
                                 try {
-                                        $phpmailer->addAttachment( $attachment );
+                                        $phpmailer->addAttachment( $attachment, $filename );
                                 } catch ( PHPMailer\PHPMailer\Exception $e ) {
                                         continue;