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

pull/8277/head
Alexandre Dulaunoy 2022-03-24 15:44:05 +01:00
commit 1098da8f3b
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
1 changed files with 1 additions and 1 deletions

View File

@ -4429,7 +4429,7 @@ class Event extends AppModel
}
$servers = $this->Server->find('all', [
'conditions' => $conditions,
'recursive' => -1,
'contain' => ['RemoteOrg', 'Organisation'],
'order' => ['Server.priority ASC', 'Server.id ASC'],
]);
// iterate over the servers and upload the event