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

Merge branch 'master' into feature/sg 

Conflicts:
	VERSION.json
	app/Model/Attribute.php
pull/762/head
Iglocska 2015-07-22 19:30:45 +02:00
parent 47cc0e4d18 a7e30bfd55
commit 00005bca97
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Model/Attribute.php
View File

@ -1331,7 +1331,7 @@ class Attribute extends AppModel {
$tagArray = $tag->fetchEventTagIds($args[0], $args[1]);
if ($id) {
foreach ($eventIds as $k => $v) {
//if ($)
if ($v['Event']['id'] !== $id) unset($eventIds[$k]);
}
}
if (!empty($tagArray[0])) {
@ -1345,6 +1345,7 @@ class Attribute extends AppModel {
}
}
}
if ($format == 'suricata') App::uses('NidsSuricataExport', 'Export');
else App::uses('NidsSnortExport', 'Export');