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

Merge branch 'hotfix-2.3.178'

pull/731/merge v2.3.178
iglocska 2015-12-14 11:51:37 +01:00
parent 2213240e5f 4b115c8bfa
commit 45aa7dfd8b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":177}
{"major":2, "minor":3, "hotfix":178}

1
app/Controller/EventsController.php
View File

@ -2917,6 +2917,7 @@ class EventsController extends AppController {
if (isset($resultArray[$i]) && $v == $resultArray[$i]) unset ($resultArray[$k]);
}
}
$resultArray = array_values($resultArray);
$typeCategoryMapping = array();
foreach ($this->Event->Attribute->categoryDefinitions as $k => $cat) {
foreach ($cat['types'] as $type) {