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

Merge branch 'hotfix-2.1.15'

pull/195/head
iglocska 2013-08-29 12:43:39 +02:00
parent 309630499f 40886018da
commit ec55596ba7
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

@ -1601,7 +1601,7 @@ class EventsController extends AppController {
$econditions['AND']['OR'] = array('event.distribution >' => 0, 'event.org =' => $this->Auth->user('org'));
}
if ($eventid == null) {
$econditions['AND'][] = array('event.published =' => 1);
$econditions['AND'][] = array('Event.published =' => 1);
}
// If it's a full download (eventid == null) and the user is not a site admin, we need to first find all the events that the user can see and save the IDs
if ($eventid == null) {