bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #9313 from nupplaphil/bug/9282-header

Browse source 
Remove whitespace before ":" of mail headers
This commit is contained in:
Hypolite Petovan 2020-09-28 14:46:18 -04:00 committed by GitHub
commit d4d9c5a18e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Object/Email.php
View file

@ -137,10 +137,10 @@ class Email implements IEmail
foreach ($this->additionalMailHeader as $name => $values) { foreach ($this->additionalMailHeader as $name => $values) {
if (is_array($values)) { if (is_array($values)) {
foreach ($values as $value) { foreach ($values as $value) {
$headerString .= "$name : $value\n"; $headerString .= "$name: $value\n";
} }
} else { } else {
$headerString .= "$name : $values\n"; $headerString .= "$name: $values\n";
} }
} }
return $headerString; return $headerString;

8
tests/src/Util/EMailerTest.php
View file

@ -83,10 +83,10 @@ class EMailerTest extends MockedTest
$this->assertTrue($emailer->send($testEmail)); $this->assertTrue($emailer->send($testEmail));
$this->assertContains("X-Friendica-Host : friendica.local", EmailerSpy::$MAIL_DATA['headers']); $this->assertContains("X-Friendica-Host: friendica.local", EmailerSpy::$MAIL_DATA['headers']);
$this->assertContains("X-Friendica-Platform : Friendica", EmailerSpy::$MAIL_DATA['headers']); $this->assertContains("X-Friendica-Platform: Friendica", EmailerSpy::$MAIL_DATA['headers']);
$this->assertContains("List-ID : <notification.friendica.local>", EmailerSpy::$MAIL_DATA['headers']); $this->assertContains("List-ID: <notification.friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
$this->assertContains("List-Archive : <http://friendica.local/notifications/system>", EmailerSpy::$MAIL_DATA['headers']); $this->assertContains("List-Archive: <http://friendica.local/notifications/system>", EmailerSpy::$MAIL_DATA['headers']);
$this->assertContains("Reply-To: Sender <sender@friendica.local>", EmailerSpy::$MAIL_DATA['headers']); $this->assertContains("Reply-To: Sender <sender@friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
$this->assertContains("MIME-Version: 1.0", EmailerSpy::$MAIL_DATA['headers']); $this->assertContains("MIME-Version: 1.0", EmailerSpy::$MAIL_DATA['headers']);
// Base64 "Test Text" // Base64 "Test Text"