diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-01-20 15:43:21 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-01-20 15:43:21 +0100 |
| commit | 713c996a0839664570ba24940e6a039ceee654ff (patch) | |
| tree | 1bc64053f8d9d0f85eaafdc8d2131d2366518355 /phpBB/phpbb | |
| parent | 2af8713a48d23128c9d7c2e52daa4bfe820854e7 (diff) | |
| parent | e8bbbbd6fac8a1f04bc74e9ada9df2f5ea83eb25 (diff) | |
| download | forums-713c996a0839664570ba24940e6a039ceee654ff.tar forums-713c996a0839664570ba24940e6a039ceee654ff.tar.gz forums-713c996a0839664570ba24940e6a039ceee654ff.tar.bz2 forums-713c996a0839664570ba24940e6a039ceee654ff.tar.xz forums-713c996a0839664570ba24940e6a039ceee654ff.zip | |
Merge pull request #5510 from mrgoldy/ticket/15931
[ticket/15931] Fix PM report emails
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/notification/type/report_pm.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php index 7e53ffb3ca..444f98270d 100644 --- a/phpBB/phpbb/notification/type/report_pm.php +++ b/phpBB/phpbb/notification/type/report_pm.php @@ -142,13 +142,16 @@ class report_pm extends \phpbb\notification\type\pm */ 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}&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() { - return array($this->get_data('reporter_id')); - } + return array( + $this->get_data('from_user_id'), + $this->get_data('reporter_id'), + ); } /** * {@inheritdoc} |