* Fix bug #20284.
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user