Merge branch 'hotfix-2.1.5'

pull/195/head
iglocska 2013-08-08 11:44:57 +02:00
commit 808ebd1eb0
1 changed files with 4 additions and 2 deletions

View File

@ -376,12 +376,14 @@ class Event extends AppModel {
'order' => array('Correlation.event_id DESC')));
$relatedAttributes = array();
foreach($correlations as $correlation) {
$relatedAttributes[$correlation['Correlation']['1_attribute_id']][] = array(
$current = array(
'id' => $correlation['Correlation']['event_id'],
'org' => $correlation['Correlation']['org'],
'info' => $correlation['Correlation']['info']
);
if (empty($relatedAttributes[$correlation['Correlation']['1_attribute_id']]) || !in_array($current, $relatedAttributes[$correlation['Correlation']['1_attribute_id']])) {
$relatedAttributes[$correlation['Correlation']['1_attribute_id']][] = $current;
}
}
return $relatedAttributes;
}