MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' of github.com:MISP/MISP into develop

pull/8646/head
Sami Mokaddem 2022-10-06 10:14:54 +02:00
parent dc6401894c 37a794fc57
commit 9349a6b3bb
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/UsersController.php
View File

@ -698,6 +698,9 @@ class UsersController extends AppController
if (!isset($this->request->data['User']['disabled'])) {
$this->request->data['User']['disabled'] = false;
}
if (Configure::read('CustomAuth_enable') && Configure::read('CustomAuth_required')) {
$this->request->data['User']['change_pw'] = 0;
}
$this->request->data['User']['newsread'] = 0;
if (!$this->_isSiteAdmin()) {
$this->request->data['User']['org_id'] = $this->Auth->user('org_id');