diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-26 12:48:25 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-26 12:48:25 -0700 |
| commit | 78aa120089bb1b82d9d6b2124dc36ec498e3924b (patch) | |
| tree | 61d6e0cb9f310df1e739cd9c388abad6adba37d8 /phpBB/phpbb | |
| parent | c19ab584202f7ec5b5fbd04ad83b2cba0964c184 (diff) | |
| parent | d5022d87e773c433f42ad6967d04f33e765e9f56 (diff) | |
| download | forums-78aa120089bb1b82d9d6b2124dc36ec498e3924b.tar forums-78aa120089bb1b82d9d6b2124dc36ec498e3924b.tar.gz forums-78aa120089bb1b82d9d6b2124dc36ec498e3924b.tar.bz2 forums-78aa120089bb1b82d9d6b2124dc36ec498e3924b.tar.xz forums-78aa120089bb1b82d9d6b2124dc36ec498e3924b.zip | |
Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
[ticket/13223] Fix USERNAME email template variable in notification
Diffstat (limited to 'phpBB/phpbb')
| -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), |