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

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

pull/9636/head
iglocska 2024-03-22 15:06:09 +01:00
parent fed7149e93 317fd056b4
commit 035b80239a
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/AttachmentScan.php
View File

@ -258,7 +258,7 @@ class AttachmentScan extends AppModel
$scanned++;
}
} catch (Exception $e) {
$this->logException("Could not scan attachment for $type {$attribute['Attribute']['id']}", $e, LOG_WARNING);
$this->logException("Could not scan attachment for $type {$attribute[$type]['id']}", $e, LOG_WARNING);
$fails++;
}

2
app/files/scripts/misp-stix

@ -1 +1 @@
Subproject commit 0428b4a43a67feed33837107ece1b144042c619e
Subproject commit f531a2cdce0e1ff2bcc879d57d2872f6318fb5cf