diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-26 12:48:35 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-26 12:48:35 -0700 |
| commit | 10251b43db50de1a00ad6bb88f8d29a15a5dd630 (patch) | |
| tree | 18d2cff6096ff79f338d68f67e880e60624d38ee | |
| parent | a686ed3df084a1883735d4b8b4fd1a1cf53be255 (diff) | |
| parent | 78aa120089bb1b82d9d6b2124dc36ec498e3924b (diff) | |
| download | forums-10251b43db50de1a00ad6bb88f8d29a15a5dd630.tar forums-10251b43db50de1a00ad6bb88f8d29a15a5dd630.tar.gz forums-10251b43db50de1a00ad6bb88f8d29a15a5dd630.tar.bz2 forums-10251b43db50de1a00ad6bb88f8d29a15a5dd630.tar.xz forums-10251b43db50de1a00ad6bb88f8d29a15a5dd630.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13223] Fix USERNAME email template variable in notification
| -rw-r--r-- | phpBB/phpbb/notification/type/admin_activate_user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/notification/type/admin_activate_user.php b/phpBB/phpbb/notification/type/admin_activate_user.php index 038ca3726e..dfc0157558 100644 --- a/phpBB/phpbb/notification/type/admin_activate_user.php +++ b/phpBB/phpbb/notification/type/admin_activate_user.php @@ -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), |