Merge branch '3.2.x'

* 3.2.x:
  [ticket/14893] Fix undefined variable on reporting PM notification
This commit is contained in:
Tristan Darricau 2016-12-11 20:26:45 +01:00
commit 9744352053
No known key found for this signature in database
GPG key ID: 817043C2E29DB881

View file

@ -142,7 +142,7 @@ 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_username($this->get_data('reporter_id'), 'no_profile'); $user_data = $this->user_loader->get_user($this->get_data('reporter_id'));
return array( return array(
'AUTHOR_NAME' => htmlspecialchars_decode($user_data['username']), 'AUTHOR_NAME' => htmlspecialchars_decode($user_data['username']),