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

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/5560/head
iglocska 2020-04-06 22:29:38 +02:00
parent 75d6a4b829 8f90f79255
commit 31662d6e15
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/Stix2Export.php
View File

@ -20,7 +20,7 @@ class Stix2Export extends StixExport
$filename = $this->__scripts_dir . 'tmp/' . $filename;
$my_server = ClassRegistry::init('Server');
$result = shell_exec($my_server->getPythonVersion() . ' ' . $scriptFile . ' ' . $filename . $this->__end_of_cmd);
$result = end(preg_split("/\r\n|\n|\r/", trim($result)));
return $result;
$result = preg_split("/\r\n|\n|\r/", trim($result));
return end($result);
}
}