makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
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
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/phpbb/notification/type/report_pm_closed.php
View file

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