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

Cleanup of some mistakes

pull/626/head
Iglocska 2015-08-27 13:47:54 +02:00
parent 21decf0ecf
commit 0ded8805c0
2 changed files with 2 additions and 2 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":117} {"major":2, "minor":3, "hotfix":119}

2
app/Controller/EventsController.php
View File

@ -2882,7 +2882,7 @@ class EventsController extends AppController {
} }
if (!is_numeric($id)) $id = $this->request->data['Event']['id']; if (!is_numeric($id)) $id = $this->request->data['Event']['id'];
$this->Event->recurisve = -1; $this->Event->recursive = -1;
$event = $this->Event->read(array('id', 'org', 'orgc', 'distribution'), $id); $event = $this->Event->read(array('id', 'org', 'orgc', 'distribution'), $id);
// org should allow to tag too, so that an event that gets pushed can be tagged locally by the owning org // org should allow to tag too, so that an event that gets pushed can be tagged locally by the owning org
if ((($this->Auth->user('org') !== $event['Event']['org'] && $this->Auth->user('org') !== $event['Event']['orgc'] && $event['Event']['distribution'] == 0) || (!$this->userRole['perm_tagger'])) && !$this->_isSiteAdmin()) { if ((($this->Auth->user('org') !== $event['Event']['org'] && $this->Auth->user('org') !== $event['Event']['orgc'] && $event['Event']['distribution'] == 0) || (!$this->userRole['perm_tagger'])) && !$this->_isSiteAdmin()) {