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

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

pull/7420/head
chrisr3d 2021-05-11 15:11:58 +02:00
parent 3cf7c5848c d278a533a0
commit 63181d2219
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/Attribute.php
View File

@ -732,7 +732,7 @@ class Attribute extends AppModel
'first_seen' => $this->data['Attribute']['first_seen'],
'last_seen' => $ls
]], 'Attribute');
if ($converted['Attribute']['first_seen'] >= $converted['Attribute']['last_seen']) {
if ($converted['Attribute']['first_seen'] > $converted['Attribute']['last_seen']) {
return false;
}
return true;

2
app/Model/MispObject.php
View File

@ -200,7 +200,7 @@ class MispObject extends AppModel
'first_seen' => $this->data['Object']['first_seen'],
'last_seen' => $ls
]], 'Object');
if ($converted['Object']['first_seen'] >= $converted['Object']['last_seen']) {
if ($converted['Object']['first_seen'] > $converted['Object']['last_seen']) {
return false;
}
return true;

2
app/Model/ShadowAttribute.php
View File

@ -468,7 +468,7 @@ class ShadowAttribute extends AppModel
'first_seen' => $this->data['ShadowAttribute']['first_seen'],
'last_seen' => $ls
]], 'ShadowAttribute');
if ($converted['ShadowAttribute']['first_seen'] >= $converted['ShadowAttribute']['last_seen']) {
if ($converted['ShadowAttribute']['first_seen'] > $converted['ShadowAttribute']['last_seen']) {
return false;
}
return true;

2
app/files/misp-objects

@ -1 +1 @@
Subproject commit 60be6a5938b930151eb5f8ce62d333c807334851
Subproject commit 8bb8a1d22c572b150820ff0a260ccba4e422d6ac

2
app/files/taxonomies

@ -1 +1 @@
Subproject commit ad917763716b7d2b612620939966628d40c91936
Subproject commit c768c55b6fda118e20ee93d8f5111b94388281af