mirror of https://github.com/MISP/MISP
Merge pull request #5128 from JakubOnderka/patch-26
fix: [audit] Correct title in audit log when admin edit userpull/5106/head^2
commit
17777e105a
|
@ -871,14 +871,10 @@ class UsersController extends AppController
|
||||||
$fieldsResultStr = substr($fieldsResultStr, 2);
|
$fieldsResultStr = substr($fieldsResultStr, 2);
|
||||||
$user = $this->User->find('first', array(
|
$user = $this->User->find('first', array(
|
||||||
'recursive' => -1,
|
'recursive' => -1,
|
||||||
'conditions' => array('User.id' => $this->id)
|
'conditions' => array('User.id' => $this->User->id)
|
||||||
));
|
));
|
||||||
$this->User->extralog($this->Auth->user(), "edit", "user", $fieldsResultStr, $user);
|
$this->User->extralog($this->Auth->user(), "edit", "user", $fieldsResultStr, $user);
|
||||||
if ($this->_isRest()) {
|
if ($this->_isRest()) {
|
||||||
$user = $this->User->find('first', array(
|
|
||||||
'conditions' => array('User.id' => $this->User->id),
|
|
||||||
'recursive' => -1
|
|
||||||
));
|
|
||||||
$user['User']['password'] = '******';
|
$user['User']['password'] = '******';
|
||||||
return $this->RestResponse->viewData($user, $this->response->type());
|
return $this->RestResponse->viewData($user, $this->response->type());
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue