vitalif
/
olap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix notices

master
vitalif 2013-04-09 15:35:53 +00:00
parent 7bd044aac2
commit b8c079cd1b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
olap.php
View File

@ -689,7 +689,7 @@ class OLAP
}
foreach ($tdhead as &$v)
{
if ($v[0]['sort'])
if (!empty($v[0]['sort']))
{
$r = array();
if ($trhead)
@ -701,7 +701,7 @@ class OLAP
}
foreach (array_reverse($trhead) as $v)
{
if ($v[0]['sort'])
if (!empty($v[0]['sort']))
{
for ($rownum = 0; $rownum < count($tdhead); $rownum++)
$rows[$rownum][] = array('class' => 'empty');
@ -741,7 +741,7 @@ class OLAP
if (array_key_exists($k, $data))
{
foreach ($fields as &$v)
if ($v['type'] == $my['type'] && $v['orig_sort'])
if ($v['type'] == $my['type'] && !empty($v['orig_sort']))
$v['sort'] = &$v['orig_sort'][$k];
$r = $this->recurse_cells($fields, $data[$k], $tdkeys);
if (is_array($r))
@ -760,7 +760,7 @@ class OLAP
if (array_key_exists($k, $tdkeys))
{
foreach ($fields as &$v)
if ($v['type'] == $my['type'] && $v['orig_sort'])
if ($v['type'] == $my['type'] && !empty($v['orig_sort']))
$v['sort'] = &$v['orig_sort'][$k];
$r = $this->recurse_cells($fields, $data[$k], $tdkeys[$k]);
if (is_array($r))
@ -813,7 +813,7 @@ class OLAP
if (array_key_exists($k, $data))
{
foreach ($fields as &$v)
if ($v['type'] == $my['type'] && $v['orig_sort'])
if ($v['type'] == $my['type'] && !empty($v['orig_sort']))
$v['sort'] = &$v['orig_sort'][$k];
$span = 0;
if ($fields)
@ -823,7 +823,7 @@ class OLAP
$span += $td['colspan'];
foreach ($subrows as $i => &$row)
{
if (!$rows[$i+1])
if (empty($rows[$i+1]))
$rows[$i+1] = array();
$rows[$i+1] = array_merge($rows[$i+1], $row);
}