From d616ef30c05ec4ded2d8288cd1e309eb6a112e6f Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Mon, 7 Mar 2022 13:54:53 +0800
Subject: [PATCH] * Fix bug #20284.

---
 module/user/model.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/module/user/model.php b/module/user/model.php
index e71a731adf..799503b8b0 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -605,9 +605,13 @@ class userModel extends model
             $this->computeUserView($this->post->account, true);
         }
 
-        if(!empty($user->password) and $user->account == $this->app->user->account) $this->app->user->password = $user->password;
         if(!dao::isError())
         {
+            if($user->account == $this->app->user->account)
+            {
+                if(!empty($user->password)) $this->app->user->password = $user->password;
+                if(!empty($user->realname)) $this->app->user->realname = $user->realname;
+            }
             $this->loadModel('score')->create('user', 'editProfile');
             $this->loadModel('action')->create('user', $userID, 'edited');
             $this->loadModel('mail');
@@ -717,6 +721,8 @@ class userModel extends model
                     $this->mail->syncSendCloud('delete', $oldUser->email);
                     $this->mail->syncSendCloud('sync', $user['email'], $user['realname']);
                 }
+
+                if($this->app->user->account == $user['account'] and !empty($user['realname'])) $this->app->user->realname = $user['realname'];
             }
 
             if($user['account'] != $oldUser->account)