mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-08 06:59:46 +01:00
fixed php5.2.6 problem: unknown type ''
This commit is contained in:
parent
9392e504b3
commit
483c8939b2
@ -149,13 +149,16 @@
|
|||||||
}
|
}
|
||||||
if ($this->last_part($name) == $nm_global['order']) // we're the active column
|
if ($this->last_part($name) == $nm_global['order']) // we're the active column
|
||||||
{
|
{
|
||||||
$cell[1] = $cell;
|
$sorting = $cell;
|
||||||
unset($cell[1]['align']);
|
unset($sorting['align']);
|
||||||
$cell[2] = $tmpl->empty_cell('image',$nm_global['sort'] != 'DESC' ? 'down' : 'up');
|
unset($sorting['span']);
|
||||||
$cell['type'] = 'hbox';
|
$cell = etemplate::empty_cell('hbox','',array(
|
||||||
$cell['size'] = '2,,0,0';
|
'span' => $cell['span'],
|
||||||
|
'size' => '2,,0,0',
|
||||||
|
1 => $sorting,
|
||||||
|
2 => etemplate::empty_cell('image',$nm_global['sort'] != 'DESC' ? 'down' : 'up'),
|
||||||
|
));
|
||||||
$class = 'activ_sortcolumn';
|
$class = 'activ_sortcolumn';
|
||||||
$cell['name'] = $cell['label'] = '';
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -182,7 +182,7 @@
|
|||||||
);
|
);
|
||||||
if ($attributes && is_array($attributes))
|
if ($attributes && is_array($attributes))
|
||||||
{
|
{
|
||||||
return array_merge($attributes,$cell);
|
$cell += $attributes;
|
||||||
}
|
}
|
||||||
return $cell;
|
return $cell;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user