From d5717b541e1d6c3164edd835273775f71ce121bf Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 7 Apr 2025 17:11:31 +0200 Subject: [PATCH] [ticket/17490] Remove name handling for mails on windows PHPBB-17490 --- phpBB/phpbb/messenger/method/email.php | 5 +---- tests/messenger/method_email_test.php | 9 +-------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index 3b580b6a69..7bd92538c2 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -146,10 +146,7 @@ class email extends base return; } - // If empty sendmail_path on windows, PHP changes the to line - $windows_empty_sendmail_path = !$this->config['smtp_delivery'] && DIRECTORY_SEPARATOR == '\\'; - - $to = new Address($address, $windows_empty_sendmail_path ? '' : trim($realname)); + $to = new Address($address, trim($realname)); $this->email->getTo() ? $this->email->addTo($to) : $this->email->to($to); } diff --git a/tests/messenger/method_email_test.php b/tests/messenger/method_email_test.php index e0dfae93b5..432e90939b 100644 --- a/tests/messenger/method_email_test.php +++ b/tests/messenger/method_email_test.php @@ -277,14 +277,7 @@ class phpbb_messenger_method_email_test extends \phpbb_test_case // Valid address with name $this->method_email->to('bar@foo.com', 'Bar Foo'); $this->assertEquals('bar@foo.com', $email->getTo()[1]->getAddress()); - if (DIRECTORY_SEPARATOR == '\\') - { - $this->assertEmpty($email->getTo()[1]->getName()); - } - else - { - $this->assertEquals('Bar Foo', $email->getTo()[1]->getName()); - } + $this->assertEquals('Bar Foo', $email->getTo()[1]->getName()); } public function test_cc()