vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve handling of incomplete From and Content-Type headers in wp_mail().

Browse Source 
When an incomplete header is provided (eg, 'From' with an email address but no
name), ensure that the WP defaults are filled in properly.

Props valendesigns.
Fixes #30266.

git-svn-id: https://develop.svn.wordpress.org/trunk@32070 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges
2015-04-07 20:09:46 +00:00
parent 5606e42df4
commit bffb632183
2 changed files with 110 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
tests/phpunit/tests/mail.php
View File

@@ -156,4 +156,94 @@ class Tests_Mail extends WP_UnitTestCase {
// Fatal errors
$this->assertFalse( wp_mail( 'invalid.address', 'subject', 'body', '', array() ) );
}
/**
* @ticket 30266
*/
public function test_wp_mail_with_valid_from_header() {
$to = "address@tld.com";
$subject = "Testing";
$message = "Test Message";
$headers = "From: Foo <bar@example.com>";
$expected = "From: Foo <bar@example.com>";
wp_mail( $to, $subject, $message, $headers );
$this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
}
/**
* @ticket 30266
*/
public function test_wp_mail_with_empty_from_header() {
$to = "address@tld.com";
$subject = "Testing";
$message = "Test Message";
$headers = "From: ";
$expected = "From: WordPress <wordpress@example.com>";
wp_mail( $to, $subject, $message, $headers );
$this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
}
/**
* @ticket 30266
*/
public function test_wp_mail_with_empty_from_name_for_the_from_header() {
$to = "address@tld.com";
$subject = "Testing";
$message = "Test Message";
$headers = "From: <wordpress@example.com>";
$expected = "From: WordPress <wordpress@example.com>";
wp_mail( $to, $subject, $message, $headers );
$this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
}
/**
* @ticket 30266
*/
public function test_wp_mail_with_valid_content_type_header() {
$to = "address@tld.com";
$subject = "Testing";
$message = "Test Message";
$headers = "Content-Type: text/html; charset=iso-8859-1";
$expected = "Content-Type: text/html; charset=iso-8859-1";
wp_mail( $to, $subject, $message, $headers );
$this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
}
/**
* @ticket 30266
*/
public function test_wp_mail_with_empty_content_type_header() {
$to = "address@tld.com";
$subject = "Testing";
$message = "Test Message";
$headers = "Content-Type: ";
$expected = "Content-Type: text/plain; charset=UTF-8";
wp_mail( $to, $subject, $message, $headers );
$this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
}
/**
* @ticket 30266
*/
public function test_wp_mail_with_empty_charset_for_the_content_type_header() {
$to = "address@tld.com";
$subject = "Testing";
$message = "Test Message";
$headers = "Content-Type: text/plain;";
$expected = "Content-Type: text/plain; charset=UTF-8";
wp_mail( $to, $subject, $message, $headers );
$this->assertTrue( strpos( $GLOBALS['phpmailer']->mock_sent[0]['header'], $expected ) > 0 );
}
}