aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrxu <rxu@mail.ru>2014-10-27 00:36:58 +0700
committerNils Adermann <naderman@naderman.de>2014-10-26 12:47:57 -0700
commit5431aa6391571a1de11fe338f6064ad87aa6f7df (patch)
tree9ece23a363ad58b4cd5dcb7c576e7fb3b1aec4f9
parent7f347a290c025aef1c6da8373c6ef1797774435b (diff)
downloadforums-5431aa6391571a1de11fe338f6064ad87aa6f7df.tar
forums-5431aa6391571a1de11fe338f6064ad87aa6f7df.tar.gz
forums-5431aa6391571a1de11fe338f6064ad87aa6f7df.tar.bz2
forums-5431aa6391571a1de11fe338f6064ad87aa6f7df.tar.xz
forums-5431aa6391571a1de11fe338f6064ad87aa6f7df.zip
[ticket/13223] Fix USERNAME email template variable in notification
admin_activate_user.php notification type is assigning usernames to email template variables using user_loader->get_username() in 'no_profile' mode, which in its turn calls get_username_string() function in 'no_profile' mode. This causes HTML markup in emails for username colour. PHPBB3-13223
-rw-r--r--phpBB/phpbb/notification/type/admin_activate_user.php2
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),