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

fix: [attackMatrix] cluster ATT&CK Tactic is shown in Mitre namespace 

only
pull/3347/head
Sami Mokaddem 2018-06-15 13:14:45 +00:00
parent 57077b40ae
commit 4785400228
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controller/GalaxiesController.php
View File

@ -71,16 +71,17 @@ class GalaxiesController extends AppController {
$conditions[] = array('description !=' => $expectedDescription);
$conditions2 = array('namespace' => $namespace);
$conditions2[] = array('description' => $expectedDescription);
$tacticGalaxies = $this->Galaxy->find('all', array(
'recursive' => -1,
'conditions' => $conditions2,
));
}
$galaxies = $this->Galaxy->find('all', array(
'recursive' => -1,
'conditions' => $conditions,
));
$tacticGalaxies = $this->Galaxy->find('all', array(
'recursive' => -1,
'conditions' => $conditions2,
));
if (count($tacticGalaxies) > 0) {
if (!empty($tacticGalaxies)) {
$galaxies[] = array('Galaxy' => array(
'id' => '-1',
'uuid' => '-1',