makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-17 16:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* 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
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/notification/type/admin_activate_user.php
View file

@ -131,7 +131,7 @@ class admin_activate_user extends \phpbb\notification\type\base
public function get_email_template_variables() public function get_email_template_variables()
{ {
$board_url = generate_board_url(); $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( return array(
'USERNAME' => htmlspecialchars_decode($username), 'USERNAME' => htmlspecialchars_decode($username),