aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/notification
diff options
context:
space:
mode:
authorjaviexin <javiexin@gmail.com>2017-02-15 23:56:52 +0100
committerGitHub <noreply@github.com>2017-02-15 23:56:52 +0100
commit7f69580df3b6125941fc39d63f8498488f32231a (patch)
treef7c3816515cdbe98aee078f8ece97d79f77bd017 /phpBB/phpbb/notification
parent7646280d518a4f637ec267fadb5e563f5b149512 (diff)
parentb567c6e2414d069ba54f7a924c952069aa115237 (diff)
downloadforums-7f69580df3b6125941fc39d63f8498488f32231a.tar
forums-7f69580df3b6125941fc39d63f8498488f32231a.tar.gz
forums-7f69580df3b6125941fc39d63f8498488f32231a.tar.bz2
forums-7f69580df3b6125941fc39d63f8498488f32231a.tar.xz
forums-7f69580df3b6125941fc39d63f8498488f32231a.zip
Merge branch '3.1.x' into ticket/15011
Diffstat (limited to 'phpBB/phpbb/notification')
-rw-r--r--phpBB/phpbb/notification/type/report_pm.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php
index cc32984ac6..fc39623c5c 100644
--- a/phpBB/phpbb/notification/type/report_pm.php
+++ b/phpBB/phpbb/notification/type/report_pm.php
@@ -141,6 +141,8 @@ 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'));
+
return array(
'AUTHOR_NAME' => htmlspecialchars_decode($user_data['username']),
'SUBJECT' => htmlspecialchars_decode(censor_text($this->get_data('message_subject'))),