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

fix: Fixed an invalid array_merge in the attribute fetcher

pull/1476/head
iglocska 2016-08-24 09:37:22 +02:00
parent 0b9185c1fa
commit b1285f5625
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/Model/Attribute.php
View File

@ -1775,7 +1775,7 @@ class Attribute extends AppModel {
if (isset($options['order'])) $params['order'] = $options['order'];
else ($params['order'] = array());
if (!$user['Role']['perm_sync'] || !isset($options['deleted']) || !$options['deleted']) $params['conditions']['AND']['Attribute.deleted'] = 0;
if (isset($options['group'])) $params['group'] = array_merge('Attribute.id', $options['group']);
if (isset($options['group'])) $params['group'] = array_merge(array('Attribute.id'), $options['group']);
if (Configure::read('MISP.unpublishedprivate')) $params['conditions']['AND'][] = array('OR' => array('Event.published' => 1, 'Event.orgc_id' => $user['org_id']));
$results = $this->find('all', $params);
if (isset($options['withAttachments']) && $options['withAttachments']) {