[ticket/15931] Fix PM report emails

gijs-martens · gijs-martens · commit e8bbbbd6fac8 · 2019-01-14T14:52:06.000+01:00
PHPBB3-15931
diff --git a/phpBB/language/en/email/report_pm.txt b/phpBB/language/en/email/report_pm.txt
@@ -1,4 +1,4 @@
-Subject: Private Message report - "{TOPIC_TITLE}"
+Subject: Private Message report - "{SUBJECT}"
 
 Hello {USERNAME},
 
diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php
@@ -142,13 +142,16 @@ public function get_email_template()
 	*/
 	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(
 			'AUTHOR_NAME'	=> htmlspecialchars_decode($user_data['username']),
 			'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}&amp;i=pm_reports&amp;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}&amp;i=pm_reports&amp;mode=pm_report_details",
 		);
 	}
 
@@ -236,8 +239,10 @@ public function get_avatar()
 	*/
 	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}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Subject: Private Message report - "{TOPIC_TITLE}"`
	`1`	`+Subject: Private Message report - "{SUBJECT}"`
`2`	`2`
`3`	`3`	`Hello {USERNAME},`
`4`	`4`