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

Merge branch 'hotfix-2.2.30'

pull/274/merge
iglocska 2014-05-06 17:11:21 +02:00
parent 24c3464d22 83315ac70a
commit a6c2c392d2
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/Controller/EventsController.php
View File

@ -769,8 +769,8 @@ class EventsController extends AppController {
else $this->request->data = $this->Event->updateXMLArray($this->request->data, false);
}
// Workaround for different structure in XML/array than what CakePHP expects
$this->request->data = $this->Event->cleanupEventArrayFromXML($this->request->data);
if (isset($this->request->data['response'])) $this->request->data = $this->request->data['response'];
$this->request->data = $this->Event->cleanupEventArrayFromXML($this->request->data);
// the event_id field is not set (normal) so make sure no validation errors are thrown
// LATER do this with $this->validator()->remove('event_id');
unset($this->Event->Attribute->validate['event_id']);