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

Merge branch '2.4' into feature/dashboard

pull/5635/head
iglocska 2020-03-01 23:04:07 +01:00
parent 46c4cf9eea 95eb2af765
commit de87ecfaf2
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Lib/Export/JsonExport.php
View File

@ -23,7 +23,7 @@ class JsonExport
App::uses('JSONConverterTool', 'Tools');
$this->__converter = new JSONConverterTool();
}
return json_encode($this->__converter->convertObject($event, false, true));
return json_encode($this->__converter->convert($event, false, true));
}
private function __objectHandler($object, $options = array()) {
@ -31,7 +31,7 @@ class JsonExport
App::uses('JSONConverterTool', 'Tools');
$this->__converter = new JSONConverterTool();
}
return json_encode($this->__converter->convert($object, false, true));
return json_encode($this->__converter->convertObject($object, false, true));
}
private function __attributeHandler($attribute, $options = array())