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

Merge branch 'hotfix-2.2.5'

pull/224/head
iglocska 2014-02-26 10:23:48 +01:00
parent 007ccd560a 8956236319
commit ed77145108
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/EventsController.php
View File

@ -483,7 +483,7 @@ class EventsController extends AppController {
is_uploaded_file($this->data['Event']['submittedgfi']['tmp_name'])) {
$this->Session->setFlash(__('You may only upload GFI Sandbox zip files.'));
} else {
if ($this->_isRest()) $this->request->data = $this->updateXMLArray($this->request->data, false);
if ($this->_isRest()) $this->request->data = $this->Event->updateXMLArray($this->request->data, false);
$add = $this->Event->_add($this->request->data, $this->_isRest(), $this->Auth->user(), '');
if ($add && !is_numeric($add)) {
if ($this->_isRest()) {
@ -749,7 +749,7 @@ class EventsController extends AppController {
if ($this->request->is('post') || $this->request->is('put')) {
if ($this->_isRest()) {
$saveEvent = false;
if ($this->_isRest()) $this->request->data = $this->updateXMLArray($this->request->data, false);
if ($this->_isRest()) $this->request->data = $this->Event->updateXMLArray($this->request->data, false);
// Workaround for different structure in XML/array than what CakePHP expects
$this->Event->cleanupEventArrayFromXML($this->request->data);