diff options
author | Michael Hamann <michael@content-space.de> | 2013-12-01 21:25:29 +0100 |
---|---|---|
committer | Michael Hamann <michael@content-space.de> | 2013-12-01 21:27:49 +0100 |
commit | 6be717dbb579e1cc7e2fbb82d7ddade3e5892c47 (patch) | |
tree | f9bc76ab7c6226a41300b5f9f9f932bc9c397b01 /_test | |
parent | 06ba6baf09df8e3379597f5107bd773c781995d6 (diff) | |
download | rpg-6be717dbb579e1cc7e2fbb82d7ddade3e5892c47.tar.gz rpg-6be717dbb579e1cc7e2fbb82d7ddade3e5892c47.tar.bz2 |
Fix sending empty and duplicated headers, FS#2887
This fixes sending empty and duplicated To/Cc/Bcc, Subject and From
headers in the additional headers. The To-header in the additional
headers prevented mail sending on some systems.
Diffstat (limited to '_test')
-rw-r--r-- | _test/tests/inc/mailer.test.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php index bac0c39ba..4541d9906 100644 --- a/_test/tests/inc/mailer.test.php +++ b/_test/tests/inc/mailer.test.php @@ -154,7 +154,19 @@ class mailer_test extends DokuWikiTest { $headers['Cc'] = ''; $header = $mail->prepareHeaders(); $this->assertEquals(0, preg_match('/(^|\n)Bcc: (\n|$)/', $header), 'Bcc found in headers.'); - $this->assertEquals(0, preg_match('/(^|\n)Cc: (\n|$)/', $header), 'Bcc found in headers.'); + $this->assertEquals(0, preg_match('/(^|\n)Cc: (\n|$)/', $header), 'Cc found in headers.'); + } + + function test_nullTOorCCorBCC() { + $mail = new TestMailer(); + $headers = &$mail->propRef('headers'); + $headers['Bcc'] = NULL; + $headers['Cc'] = NULL; + $headers['To'] = NULL; + $header = $mail->prepareHeaders(); + $this->assertEquals(0, preg_match('/(^|\n)Bcc: (\n|$)/', $header), 'Bcc found in headers.'); + $this->assertEquals(0, preg_match('/(^|\n)Cc: (\n|$)/', $header), 'Cc found in headers.'); + $this->assertEquals(0, preg_match('/(^|\n)To: (\n|$)/', $header), 'To found in headers.'); } /** |