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

fix: 984732984th time is the charm...

pull/2643/merge
iglocska 2017-11-16 08:50:06 +01:00
parent 1058345ee7
commit 5303b86987
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Model/User.php
View File

@ -269,7 +269,8 @@ class User extends AppModel {
}
if (isset($user['User']['id']))
$user = $this->find('first', array(
'recursive' => array('User.id' => $user['User']['id']),
'recursive' => -1,
'condiitons' => array('User.id' => $user['User']['id']),
'fields' => array('id', 'email', 'last_login', 'date_modified', 'org_id', 'termsaccepted', 'autoalert', 'newsread', 'disabled'),
'contain' => array(
'Organisation' => array(