Skip to content

Commit 43d3488

Browse files
committed
[ticket/17489] Remove unneeded headers check
PHPBB-17487 PHPBB-17489
1 parent f9e6385 commit 43d3488

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

phpBB/phpbb/message/message.php

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -263,19 +263,16 @@ public function send(\phpbb\di\service_collection $messenger, $contact)
263263
$messenger_method->set_addresses($recipient);
264264
$messenger_method->reply_to($this->sender_address);
265265

266-
if (isset($messenger_method->headers) && $messenger_method->headers instanceof \Symfony\Component\Mime\Header\Headers)
266+
$messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name);
267+
$messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip);
268+
if ($this->sender_id)
267269
{
268-
$messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name);
269-
$messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip);
270-
if ($this->sender_id)
271-
{
272-
$messenger_method->header('X-AntiAbuse', 'User_id - ' . $this->sender_id);
273-
}
270+
$messenger_method->header('X-AntiAbuse', 'User_id - ' . $this->sender_id);
271+
}
274272

275-
if ($this->sender_username)
276-
{
277-
$messenger_method->header('X-AntiAbuse', 'Username - ' . $this->sender_username);
278-
}
273+
if ($this->sender_username)
274+
{
275+
$messenger_method->header('X-AntiAbuse', 'Username - ' . $this->sender_username);
279276
}
280277

281278
$messenger_method->subject(html_entity_decode($this->subject, ENT_COMPAT));

0 commit comments

Comments
 (0)