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

Merge branch 'hotfix-2.3.77'

pull/541/head v2.3.78
Iglocska 2015-06-05 11:09:56 +02:00
parent 65c299a13b b7ab62c337
commit 56cff7c186
2 changed files with 3 additions and 3 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":76}
{"major":2, "minor":3, "hotfix":77}

4
app/Controller/EventsController.php
View File

@ -1468,7 +1468,7 @@ class EventsController extends AppController {
$this->Event->recursive = -1;
$event = $this->Event->read(null, $id);
if (!$this->_isSiteAdmin()) {
if (!$this->userRole['perm_publish'] && !$this->Auth->user('org') === $this->Event->data['Event']['orgc']) {
if (!$this->userRole['perm_publish'] || $this->Auth->user('org') !== $this->Event->data['Event']['orgc']) {
throw new MethodNotAllowedException('You don\'t have the permission to do that.');
}
}
@ -1517,7 +1517,7 @@ class EventsController extends AppController {
$this->Event->recursive = -1;
$this->Event->read(null, $id);
if (!$this->_isSiteAdmin()) {
if (!$this->userRole['perm_publish'] && !$this->Auth->user('org') === $this->Event->data['Event']['orgc']) {
if (!$this->userRole['perm_publish'] || $this->Auth->user('org') !== $this->Event->data['Event']['orgc']) {
throw new MethodNotAllowedException('You don\'t have the permission to do that.');
}
}