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

Merge branch 'hotfix-2.3.134'

pull/679/head v2.3.134
Iglocska 2015-09-24 11:27:00 +02:00
parent 88fcf39194 5f1196eba5
commit 24ff042749
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":133}
{"major":2, "minor":3, "hotfix":134}

6
app/Controller/EventBlacklistsController.php
View File

@ -59,9 +59,9 @@ class EventBlacklistsController extends AppController {
if ($this->EventBlacklist->save(
array(
'event_uuid' => $uuid,
'comment' => $data['EventBlacklist']['comment'],
'event_info' => $data['EventBlacklist']['info'],
'event_orgc' => $data['EventBlacklist']['orgc'],
'comment' => !empty($data['EventBlacklist']['comment']) ? $data['EventBlacklist']['comment'] : '',
'event_info' => !empty($data['EventBlacklist']['info']) ? $data['EventBlacklist']['info'] : '',
'event_orgc' => !empty($data['EventBlacklist']['orgc']) ? $data['EventBlacklist']['orgc'] : '',
)
)
) {