From c603c39aaff1d15a976fcaa673f34eddcf4a3011 Mon Sep 17 00:00:00 2001
From: Alexander Skvortsov <sasha.skvortsov109@gmail.com>
Date: Fri, 4 Dec 2020 15:08:55 -0500
Subject: [PATCH] Fix reverting nickname to username in EditUserModal

---
 extensions/nicknames/js/src/forum/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/nicknames/js/src/forum/index.js b/extensions/nicknames/js/src/forum/index.js
index 77ff422dd..7c830579c 100644
--- a/extensions/nicknames/js/src/forum/index.js
+++ b/extensions/nicknames/js/src/forum/index.js
@@ -45,7 +45,7 @@ app.initializers.add('flarum/nicknames', () => {
     if (app.forum.attribute('displayNameDriver') !== 'nickname') return;
 
     const user = this.attrs.user;
-    if (this.nickname() !== this.attrs.user.username()) {
+    if (this.nickname() !== this.attrs.user.displayName()) {
       data.nickname = this.nickname();
     }
   });