mirror of https://github.com/MISP/MISP
Merge branch 'hotfix-2.3.120' into develop
commit
ffef691aa6
|
@ -1 +1 @@
|
|||
{"major":2, "minor":3, "hotfix":117}
|
||||
{"major":2, "minor":3, "hotfix":119}
|
|
@ -2882,7 +2882,7 @@ class EventsController extends AppController {
|
|||
}
|
||||
|
||||
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);
|
||||
// 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()) {
|
||||
|
|
Loading…
Reference in New Issue