Ticket #28407: 28407.3.diff

src/wp-includes/pluggable.php

@@ -517 +517 @@
                 }
 
                 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;
                                 }

tests/phpunit/tests/pluggable/wpMail.php

@@ -455 +455 @@
         }
 
         /**
+         * Test that attachment file names are derived from array values when their
+         * associative array keys are numeric.
+         *
+         * @ticket 28407
+         */
+        public function test_wp_mail_sends_attachments_with_original_name() {
+                wp_mail( 'user@example.org', 'Subject', 'Hello World', '', array(
+                        DIR_TESTDATA . '/images/canola.jpg',
+                        DIR_TESTDATA . '/images/waffles.jpg'
+                ) );
+
+                /** @var PHPMailer $mailer */
+                $mailer = tests_retrieve_phpmailer_instance();
+
+                $attachments = $mailer->getAttachments();
+
+                $this->assertTrue( $mailer->attachmentExists() );
+                $this->assertSame( $attachments[0][1], $attachments[0][2] );
+                $this->assertSame( $attachments[1][1], $attachments[1][2] );
+        }
+
+        /**
+         * Test that attachment file names are derived from array keys when they
+         * are non-empty strings.
+         *
+         * @ticket 28407
+         */
+        public function test_wp_mail_sends_attachments_with_custom_name() {
+                wp_mail( 'user@example.org', 'Subject', 'Hello World', '', array(
+                        'alonac.jpg'  => DIR_TESTDATA . '/images/canola.jpg',
+                        'selffaw.jpg' => DIR_TESTDATA . '/images/waffles.jpg'
+                ) );
+
+                /** @var PHPMailer $mailer */
+                $mailer = tests_retrieve_phpmailer_instance();
+
+                $attachments = $mailer->getAttachments();
+
+                $this->assertTrue( $mailer->attachmentExists() );
+                $this->assertSame( 'alonac.jpg', $attachments[0][2] );
+                $this->assertSame( 'selffaw.jpg', $attachments[1][2] );
+        }
+
+        /**
          * @ticket 50720
          */
         public function test_phpmailer_validator() {