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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2019-01-20 15:43:27 +01:00
commit c76a6177d6
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/language/en/email/report_pm.txt
View file

@ -1,4 +1,4 @@
Subject: Private Message report - "{TOPIC_TITLE}" Subject: Private Message report - "{SUBJECT}"
Hello {USERNAME}, Hello {USERNAME},

13
phpBB/phpbb/notification/type/report_pm.php
View file

@ -142,13 +142,16 @@ class report_pm extends \phpbb\notification\type\pm
*/ */
public function get_email_template_variables() public function get_email_template_variables()
{ {
$user_data = $this->user_loader->get_user($this->get_data('reporter_id')); $user_data = $this->user_loader->get_user($this->get_data('from_user_id'));
return array( return array(
'AUTHOR_NAME' => htmlspecialchars_decode($user_data['username']), 'AUTHOR_NAME' => htmlspecialchars_decode($user_data['username']),
'SUBJECT' => htmlspecialchars_decode(censor_text($this->get_data('message_subject'))), 'SUBJECT' => htmlspecialchars_decode(censor_text($this->get_data('message_subject'))),
'U_VIEW_REPORT' => generate_board_url() . "mcp.{$this->php_ext}?r={$this->item_parent_id}&i=pm_reports&mode=pm_report_details", /** @deprecated 3.2.6-RC1 (to be removed in 4.0.0) use {SUBJECT} instead in report_pm.txt */
'TOPIC_TITLE' => htmlspecialchars_decode(censor_text($this->get_data('message_subject'))),
'U_VIEW_REPORT' => generate_board_url() . "/mcp.{$this->php_ext}?r={$this->item_parent_id}&i=pm_reports&mode=pm_report_details",
); );
} }
@ -236,8 +239,10 @@ class report_pm extends \phpbb\notification\type\pm
*/ */
public function users_to_query() public function users_to_query()
{ {
return array($this->get_data('reporter_id')); return array(
} $this->get_data('from_user_id'),
$this->get_data('reporter_id'),
); }
/** /**
* {@inheritdoc} * {@inheritdoc}