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/1184/head
Iglocska 2016-05-27 15:47:52 +02:00
parent c4725a3108 16da73fb6a
commit 044755fe07
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/Server.php
View File

@ -1177,7 +1177,7 @@ class Server extends AppModel {
$r = $this->EventBlacklist->find('first', array('conditions' => array('event_uuid' => $event['Event']['uuid'])));
if (!empty($r)) {
$blocked = true;
$fails[$eventId] = 'Event blocked by local blocklist.';
$fails[$eventId] = 'Event blocked by local blacklist.';
}
}
if (!$blocked) {