Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/13223] Fix USERNAME email template variable in notification
This commit is contained in:
Nils Adermann 2014-10-26 12:48:35 -07:00
commit 10251b43db

View file

@ -131,7 +131,7 @@ class admin_activate_user extends \phpbb\notification\type\base
public function get_email_template_variables()
{
$board_url = generate_board_url();
$username = $this->user_loader->get_username($this->item_id, 'no_profile');
$username = $this->user_loader->get_username($this->item_id, 'username');
return array(
'USERNAME' => htmlspecialchars_decode($username),