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

Merge pull request #1131 from I-am-Sherlocked/patch-5 

Resolving the sql_mode=only_full_group_by error in Search Log
pull/1136/head
Andras Iklody 2016-05-18 08:35:59 +02:00
parent 884a6b8547 3807b6b101
commit e438ee41f8
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/LogsController.php
View File

@ -244,7 +244,7 @@ class LogsController extends AppController {
$models = array('Attribute', 'Event', 'EventBlacklist', 'EventTag', 'Organisation', 'Post', 'Regexp', 'Role', 'Server', 'ShadowAttribute', 'SharingGroup', 'Tag', 'Task', 'Taxonomy', 'Template', 'Thread', 'User', 'Whitelist');
$existing_models = $this->Log->find('list', array(
'fields' => array('Log.model'),
'group' => array('Log.model')
'group' => array('Log.model','Log.id')
));
$models = array_intersect($models, $existing_models);
$models = array('' => 'ALL') + $this->_arrayToValuesIndexArray($models);