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

Merge branch 'hotfix-2.1.19'

pull/195/head
iglocska 2013-09-10 10:32:52 +02:00
parent d3bd9f0f77 77e29f7068
commit 84ae298cdf
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controller/EventsController.php
View File

@ -292,9 +292,13 @@ class EventsController extends AppController {
$temp = 0;
$pivot['children'] = array_values($pivot['children']);
foreach ($pivot['children'] as $k => $v) {
$temp2 = 0;
$pivot['children'][$k]['height'] = ($temp+$k)*50;
$temp += $this->__arrangePivotVertical($pivot['children'][$k]);
if ($temp > $max) $max = $temp;
if ($k > 0) {
$temp2 = (($pivot['children'][$k]['height'] - $pivot['children'][$k-1]['height'])/50) -1;
}
if (($temp+$temp2) > $max) $max = ($temp+$temp2);
}
return $max;
}