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

Merge remote-tracking branch 'origin/develop' into 2.4

pull/9438/head
Christophe Vandeplas 2023-12-01 09:05:32 +01:00
parent 7b2d7d78ee aac06b2831
commit 02c1c30ab9
No known key found for this signature in database
GPG Key ID: BDC48619FFDC5A5B
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/UserLoginProfilesController.php
View File

@ -147,7 +147,7 @@ class UserLoginProfilesController extends AppController
'order' => array('Log.created DESC')
));
$data = $this->UserLoginProfile->_fromLog($log['Log']);
if (!$loginProfile) return $data; // skip if empty logs
if (!$data) return $data; // skip if empty logs
$data['status'] = $status;
$data['user_id'] = $user['id'];
$data['hash'] = $this->UserLoginProfile->hash($data);