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

Merge pull request #7219 from tomking2/bug/galaxy-cluster-sharinggroup 

fix: [sync] Crash when attempting to sync with 'Pull Galaxy Clusters' enabled
pull/7230/head
Jakub Onderka 2021-03-18 13:06:11 +01:00 committed by GitHub
parent 89a42b1a7c 4474dcc2cf
commit 6a8f7ff336
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/GalaxyCluster.php
View File

@ -818,7 +818,7 @@ class GalaxyCluster extends AppModel
{
$this->Event = ClassRegistry::init('Event');
if (isset($element[$model]['distribution']) && $element[$model]['distribution'] == 4) {
$element[$model] = $this->Event->__captureSGForElement($element[$model], $user);
$element[$model] = $this->Event->captureSGForElement($element[$model], $user);
}
// first we want to see how the creator organisation is encoded
// The options here are either by passing an organisation object along or simply passing a string along

2
app/Model/GalaxyClusterRelation.php
View File

@ -475,7 +475,7 @@ class GalaxyClusterRelation extends AppModel
$this->Event = ClassRegistry::init('Event');
if (isset($relation['GalaxyClusterRelation']['distribution']) && $relation['GalaxyClusterRelation']['distribution'] == 4) {
$relation['GalaxyClusterRelation'] = $this->Event->__captureSGForElement($relation['GalaxyClusterRelation'], $user);
$relation['GalaxyClusterRelation'] = $this->Event->captureSGForElement($relation['GalaxyClusterRelation'], $user);
}
$saveSuccess = $this->save($relation);