Ticket #28407: 28407-alternative.diff

src/wp-includes/pluggable.php

@@ -466 +466 @@
 
                 if ( ! empty( $attachments ) ) {
                         foreach ( $attachments as $attachment ) {
+                                if ( ! is_array( $attachment ) ) {
+                                        $attachment = array(
+                                                'path' => $attachment,
+                                        );
+                                }
+
+                                // Set PHPMailer defaults.
+                                $attachment = wp_parse_args( $attachment, array(
+                                        'path'        => null,
+                                        'name'        => '',
+                                        'encoding'    => 'base64',
+                                        'type'        => '',
+                                        'disposition' => 'attachment',
+                                ) );
+
                                 try {
-                                        $phpmailer->addAttachment( $attachment );
+                                        $phpmailer->addAttachment(
+                                                $attachment['path'],
+                                                $attachment['name'],
+                                                $attachment['encoding'],
+                                                $attachment['type'],
+                                                $attachment['disposition']
+                                        );
                                 } catch ( phpmailerException $e ) {
                                         continue;
                                 }

tests/phpunit/tests/mail.php

@@ -391 +391 @@
                 $this->assertEquals( 'wp_mail_failed', $call_args[0]->get_error_code() );
                 $this->assertEquals( $expected_error_data, $call_args[0]->get_error_data() );
         }
+
+        /**
+         * @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();
+
+                $expected = array(
+                        array(
+                                DIR_TESTDATA . '/images/canola.jpg',
+                                'canola.jpg',
+                                'canola.jpg',
+                                'base64',
+                                'image/jpeg',
+                                false,
+                                'attachment',
+                                0
+                        ),
+                        array(
+                                DIR_TESTDATA . '/images/waffles.jpg',
+                                'waffles.jpg',
+                                'waffles.jpg',
+                                'base64',
+                                'image/jpeg',
+                                false,
+                                'attachment',
+                                0
+                        )
+                );
+
+                $this->assertEqualSets( $expected, $attachments );
+        }
+
+        /**
+         * @ticket 28407
+         */
+        public function test_wp_mail_sends_attachments_with_custom_values() {
+                wp_mail( 'user@example.org', 'Subject', 'Hello World', '', array(
+                        array(
+                                'path' => DIR_TESTDATA . '/images/canola.jpg',
+                                'name' => 'myawesomeimage.jpg',
+                                'encoding' => '8bit',
+                                'type' => 'image/jpeg',
+                                'disposition' => 'attachment',
+                        ),
+                        array(
+                                'path' => DIR_TESTDATA . '/images/waffles.jpg',
+                                'name' => 'foobar.jpg',
+                                'encoding' => 'base64',
+                                'type' => 'image/png',
+                                'disposition' => 'inline',
+                        ),
+                ) );
+
+                /** @var PHPMailer $mailer */
+                $mailer = tests_retrieve_phpmailer_instance();
+
+                $attachments = $mailer->getAttachments();
+
+                $expected = array(
+                        array(
+                                DIR_TESTDATA . '/images/canola.jpg',
+                                'canola.jpg',
+                                'myawesomeimage.jpg',
+                                '8bit',
+                                'image/jpeg',
+                                false,
+                                'attachment',
+                                0
+                        ),
+                        array(
+                                DIR_TESTDATA . '/images/waffles.jpg',
+                                'waffles.jpg',
+                                'foobar.jpg',
+                                'base64',
+                                'image/png',
+                                false,
+                                'inline',
+                                0
+                        )
+                );
+
+                $this->assertEqualSets( $expected, $attachments );
+        }
 }