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

fix: [stix export] Copy paste issue from merge conflict handling

pull/8045/head
chrisr3d 2021-12-13 16:59:14 +01:00
parent a8a51ff780
commit 64a30723b7
No known key found for this signature in database
GPG Key ID: 6BBED1B63A6D639F
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/StixExport.php
View File

@ -269,7 +269,7 @@ abstract class StixExport
}
}
$converter = new JSONConverterTool();
$event = JsonTool::encode($converter->convert($data, false, true)); // we don't need pretty printed JSON
$event = JsonTool::encode($converter->convert($event, false, true)); // we don't need pretty printed JSON
if ($this->__n_attributes + $attributes_count <= $this->__attributes_limit) {
$this->__tmp_file->append($this->__n_attributes == 0 ? $event : ', ' . $event);
$this->__n_attributes += $attributes_count;
@ -368,7 +368,7 @@ abstract class StixExport
private function __write_stix_content($filename, $separator)
{
$stix_content = FileAccessTool::readAndDelete($filename);
if ($this->__return_type === 'stix') {
if ($this->__return_type === 'stix2') {
$stix_content = substr($stix_content, 1, -1);
}
$this->stixFile->writeWithSeparator($stix_content, $separator);