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

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

pull/6568/head
mokaddem 2021-06-04 11:03:27 +02:00
parent cda48b006e 8084faabdc
commit 78a2298a84
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
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/Model/Post.php
View File

@ -135,7 +135,7 @@ class Post extends AppModel
'NOT' => ['User.id' => $excludeUsers]
],
'contain' => ['User' => ['fields' => $userFields]],
'group' => ['User.id'], // remove duplicates
'group' => ['User.id', 'Post.id', 'User.email', 'User.gpgkey', 'User.certif_public', 'User.disabled'], // remove duplicates
]);
$orgMembers = array_merge($orgMembers, $temp);