diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-26 12:48:16 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-26 12:48:16 -0700 |
| commit | d5022d87e773c433f42ad6967d04f33e765e9f56 (patch) | |
| tree | 9ece23a363ad58b4cd5dcb7c576e7fb3b1aec4f9 | |
| parent | 7f347a290c025aef1c6da8373c6ef1797774435b (diff) | |
| parent | 5431aa6391571a1de11fe338f6064ad87aa6f7df (diff) | |
| download | forums-d5022d87e773c433f42ad6967d04f33e765e9f56.tar forums-d5022d87e773c433f42ad6967d04f33e765e9f56.tar.gz forums-d5022d87e773c433f42ad6967d04f33e765e9f56.tar.bz2 forums-d5022d87e773c433f42ad6967d04f33e765e9f56.tar.xz forums-d5022d87e773c433f42ad6967d04f33e765e9f56.zip | |
Merge branch 'ticket/13223' into prep-release-3.1.0
* ticket/13223:
[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), |