From 43d34880ac55c737e38d7b532b0558841da7b8fd Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Fri, 4 Apr 2025 00:50:15 +0700
Subject: [PATCH] [ticket/17489] Remove unneeded headers check

PHPBB-17487
PHPBB-17489
---
 phpBB/phpbb/message/message.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php
index 1248e3b39d..900ef103c5 100644
--- a/phpBB/phpbb/message/message.php
+++ b/phpBB/phpbb/message/message.php
@@ -263,19 +263,16 @@ class message
 					$messenger_method->set_addresses($recipient);
 					$messenger_method->reply_to($this->sender_address);
 
-					if (isset($messenger_method->headers) && $messenger_method->headers instanceof \Symfony\Component\Mime\Header\Headers)
+					$messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name);
+					$messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip);
+					if ($this->sender_id)
 					{
-						$messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name);
-						$messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip);
-						if ($this->sender_id)
-						{
-							$messenger_method->header('X-AntiAbuse', 'User_id - ' . $this->sender_id);
-						}
+						$messenger_method->header('X-AntiAbuse', 'User_id - ' . $this->sender_id);
+					}
 
-						if ($this->sender_username)
-						{
-							$messenger_method->header('X-AntiAbuse', 'Username - ' . $this->sender_username);
-						}
+					if ($this->sender_username)
+					{
+						$messenger_method->header('X-AntiAbuse', 'Username - ' . $this->sender_username);
 					}
 
 					$messenger_method->subject(html_entity_decode($this->subject, ENT_COMPAT));