mirror of https://github.com/MISP/MISP
fix: bad merge
parent
121bc48bad
commit
edd27440ac
|
@ -565,9 +565,8 @@ class EventShell extends AppShell
|
|||
|
||||
$inputFile = $this->args[0];
|
||||
$inputFile = $inputFile[0] === '/' ? $inputFile : APP . 'tmp/cache/ingest' . DS . $inputFile;
|
||||
$inputData = FileAccessTool::readFromFile($inputFile);
|
||||
$inputData = FileAccessTool::readAndDelete($inputFile);
|
||||
$inputData = $this->Event->jsonDecode($inputData);
|
||||
FileAccessTool::deleteFile($inputFile);
|
||||
Configure::write('CurrentUserId', $inputData['user']['id']);
|
||||
$this->Event->processModuleResultsData(
|
||||
$inputData['user'],
|
||||
|
|
Loading…
Reference in New Issue