From f50a11b885514fb4e9638fb32d603e5da15e8fe1 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 30 Dec 2015 15:26:54 +1030
Subject: [PATCH] Use username helper when displaying user search results

---
 .../forum/src/components/UsersSearchSource.js | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/framework/core/js/forum/src/components/UsersSearchSource.js b/framework/core/js/forum/src/components/UsersSearchSource.js
index f1b2d5222..0ea76e22c 100644
--- a/framework/core/js/forum/src/components/UsersSearchSource.js
+++ b/framework/core/js/forum/src/components/UsersSearchSource.js
@@ -1,5 +1,6 @@
 import highlight from 'flarum/helpers/highlight';
 import avatar from 'flarum/helpers/avatar';
+import username from 'flarum/helpers/username';
 
 /**
  * The `UsersSearchSource` finds and displays user search results in the search
@@ -23,14 +24,19 @@ export default class UsersSearchResults {
 
     return [
       <li className="Dropdown-header">{app.translator.trans('core.forum.search.users_heading')}</li>,
-      results.map(user => (
-        <li className="UserSearchResult" data-index={'users' + user.id()}>
-          <a href={app.route.user(user)} config={m.route}>
-            {avatar(user)}
-            {highlight(user.username(), query)}
-          </a>
-        </li>
-      ))
+      results.map(user => {
+        const name = username(user);
+        name.children[0] = highlight(name.children[0], query);
+
+        return (
+          <li className="UserSearchResult" data-index={'users' + user.id()}>
+            <a href={app.route.user(user)} config={m.route}>
+              {avatar(user)}
+              {name}
+            </a>
+          </li>
+        );
+      })
     ];
   }
 }