7 files changed, 10 insertions, 28 deletions
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index 1eaeb1a250..8d31c87817 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -112,9 +112,7 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 	*/
 	public function get_title()
 	{
-		$user_data = $this->user_loader->get_user($this->get_data('from_user_id'));
-
-		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		$username = $this->user_loader->get_username($this->get_data('from_user_id'), 'no_profile');
 
 		return $this->user->lang('NOTIFICATION_PM', $username, $this->get_data('message_subject'));
 	}
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 7e06779982..0646282c94 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -181,9 +181,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			}
 			else
 			{
-				$user_data = $this->user_loader->get_user($responder['poster_id']);
-
-				$usernames[] = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+				$usernames[] = $this->user_loader->get_username($responder['poster_id'], 'no_profile');
 			}
 		}
 
@@ -217,9 +215,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		}
 		else
 		{
-			$user_data = $this->user_loader->get_user($this->get_data('poster_id'));
-
-			$username = get_username_string('username', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'no_profile');
 		}
 
 		return array(
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index 73e22dc83b..877e8209e3 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -160,9 +160,7 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	{
 		$this->user->add_lang('mcp');
 
-		$user_data = $this->user_loader->get_user($this->get_data('reporter_id'));
-
-		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		$username = $this->user_loader->get_username($this->get_data('reporter_id'), 'no_profile');
 
 		if ($this->get_data('report_text'))
 		{
@@ -186,7 +184,7 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 
 		return $this->user->lang(
 			$this->language_key,
-				$username,
+			$username,
 			censor_text($this->get_data('message_subject')),
 			$this->get_data('reason_description')
 		);
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
index 51e5204304..2d60ae21d4 100644
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ b/phpBB/includes/notification/type/report_pm_closed.php
@@ -106,9 +106,7 @@ class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_p
 	*/
 	public function get_title()
 	{
-		$user_data = $this->user_loader->get_user($this->get_data('closer_id'));
-
-		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		$username = $this->user_loader->get_username($this->get_data('closer_id'), 'no_profile');
 
 		return $this->user->lang(
 			$this->language_key,
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index 2508644b0b..0334fdb109 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -127,9 +127,7 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 	{
 		$this->user->add_lang('mcp');
 
-		$user_data = $this->user_loader->get_user($this->get_data('reporter_id'));
-
-		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		$username = $this->user_loader->get_username($this->get_data('reporter_id'), 'no_profile');
 
 		if ($this->get_data('report_text'))
 		{
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
index a7016a8f3d..3282ba7d8c 100644
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ b/phpBB/includes/notification/type/report_post_closed.php
@@ -106,9 +106,7 @@ class phpbb_notification_type_report_post_closed extends phpbb_notification_type
 	*/
 	public function get_title()
 	{
-		$user_data = $this->user_loader->get_user($this->get_data('closer_id'));
-
-		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		$username = $this->user_loader->get_username($this->get_data('closer_id'), 'no_profile');
 
 		return $this->user->lang(
 			$this->language_key,
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 6e9347d4a8..614d644501 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -142,9 +142,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		}
 		else
 		{
-			$user_data = $this->user_loader->get_user($this->get_data('poster_id'));
-
-			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'no_profile');
 		}
 
 		return $this->user->lang(
@@ -178,9 +176,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		}
 		else
 		{
-			$user_data = $this->user_loader->get_user($this->get_data('poster_id'));
-
-			$username = get_username_string('username', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'no_profile');
 		}
 
 		return array(