1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-21 16:22:22 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2021-01-25 21:02:21 +01:00
commit 28e4c2a72c
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -100,12 +100,12 @@ class report_pm_closed extends \phpbb\notification\type\pm
*/
public function get_email_template_variables()
{
$sender_data = $this->user_loader->get_username($this->get_data('from_user_id'), 'username');
$closer_data = $this->user_loader->get_username($this->get_data('closer_id'), 'username');
$sender_username = $this->user_loader->get_username($this->get_data('from_user_id'), 'username');
$closer_username = $this->user_loader->get_username($this->get_data('closer_id'), 'username');
return [
'AUTHOR_NAME' => htmlspecialchars_decode($sender_data['username'], ENT_COMPAT),
'CLOSER_NAME' => htmlspecialchars_decode($closer_data['username'], ENT_COMPAT),
'AUTHOR_NAME' => htmlspecialchars_decode($sender_username, ENT_COMPAT),
'CLOSER_NAME' => htmlspecialchars_decode($closer_username, ENT_COMPAT),
'SUBJECT' => htmlspecialchars_decode(censor_text($this->get_data('message_subject')), ENT_COMPAT),
'U_VIEW_MESSAGE'=> generate_board_url() . "/ucp.{$this->php_ext}?i=pm&mode=view&p={$this->item_id}",