makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17490] Remove name handling for mails on windows

Browse source 
PHPBB-17490
This commit is contained in:
Marc Alexander 2025-04-07 17:11:31 +02:00
parent 8dbe499e3d
commit d5717b541e
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/phpbb/messenger/method/email.php
View file

@ -146,10 +146,7 @@ class email extends base
return; return;
} }
// If empty sendmail_path on windows, PHP changes the to line $to = new Address($address, trim($realname));
$windows_empty_sendmail_path = !$this->config['smtp_delivery'] && DIRECTORY_SEPARATOR == '\\';
$to = new Address($address, $windows_empty_sendmail_path ? '' : trim($realname));
$this->email->getTo() ? $this->email->addTo($to) : $this->email->to($to); $this->email->getTo() ? $this->email->addTo($to) : $this->email->to($to);
} }

9
tests/messenger/method_email_test.php
View file

@ -277,14 +277,7 @@ class phpbb_messenger_method_email_test extends \phpbb_test_case
// Valid address with name // Valid address with name
$this->method_email->to('bar@foo.com', 'Bar Foo'); $this->method_email->to('bar@foo.com', 'Bar Foo');
$this->assertEquals('bar@foo.com', $email->getTo()[1]->getAddress()); $this->assertEquals('bar@foo.com', $email->getTo()[1]->getAddress());
if (DIRECTORY_SEPARATOR == '\\') $this->assertEquals('Bar Foo', $email->getTo()[1]->getName());
{
$this->assertEmpty($email->getTo()[1]->getName());
}
else
{
$this->assertEquals('Bar Foo', $email->getTo()[1]->getName());
}
} }
public function test_cc() public function test_cc()