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/17487] Fix PHP uncaught exception on sending email via board

Browse source 
PHPBB-17487
This commit is contained in:
rxu 2025-04-03 10:26:50 +07:00
parent d99c3838df
commit 67265efc0d
No known key found for this signature in database
GPG key ID: 955F0567380E586A
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
phpBB/phpbb/message/message.php
View file

@ -263,15 +263,19 @@ class message
$messenger_method->set_addresses($recipient);
$messenger_method->reply_to($this->sender_address);
$messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name);
$messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip);
if ($this->sender_id)
if (isset($messenger_method->headers) && $messenger_method->headers instanceof \Symfony\Component\Mime\Header\Headers)
{
$messenger_method->header('X-AntiAbuse', 'User_id - ' . $this->sender_id);
}
if ($this->sender_username)
{
$messenger_method->header('X-AntiAbuse', 'Username - ' . $this->sender_username);
$messenger_method->headers->addHeader('X-AntiAbuse', 'Board servername - ' . $this->server_name);
$messenger_method->headers->addHeader('X-AntiAbuse', 'User IP - ' . $this->sender_ip);
if ($this->sender_id)
{
$messenger_method->headers->addHeader('X-AntiAbuse', 'User_id - ' . $this->sender_id);
}
if ($this->sender_username)
{
$messenger_method->headers->addHeader('X-AntiAbuse', 'Username - ' . $this->sender_username);
}
}
$messenger_method->subject(html_entity_decode($this->subject, ENT_COMPAT));

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

@ -47,7 +47,7 @@ class email extends base
protected $from;
/** @var Headers */
protected $headers;
public $headers;
/**
* @var int