From 483c8939b2c30bcf4576347dfbb4c8091b42e37d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 22 Jun 2008 07:21:24 +0000 Subject: [PATCH] fixed php5.2.6 problem: unknown type '' --- etemplate/inc/class.nextmatch_widget.inc.php | 15 +++++++++------ etemplate/inc/class.soetemplate.inc.php | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php index dc97f538b9..6f3888b6c9 100644 --- a/etemplate/inc/class.nextmatch_widget.inc.php +++ b/etemplate/inc/class.nextmatch_widget.inc.php @@ -149,13 +149,16 @@ } if ($this->last_part($name) == $nm_global['order']) // we're the active column { - $cell[1] = $cell; - unset($cell[1]['align']); - $cell[2] = $tmpl->empty_cell('image',$nm_global['sort'] != 'DESC' ? 'down' : 'up'); - $cell['type'] = 'hbox'; - $cell['size'] = '2,,0,0'; + $sorting = $cell; + unset($sorting['align']); + unset($sorting['span']); + $cell = etemplate::empty_cell('hbox','',array( + 'span' => $cell['span'], + 'size' => '2,,0,0', + 1 => $sorting, + 2 => etemplate::empty_cell('image',$nm_global['sort'] != 'DESC' ? 'down' : 'up'), + )); $class = 'activ_sortcolumn'; - $cell['name'] = $cell['label'] = ''; } else { diff --git a/etemplate/inc/class.soetemplate.inc.php b/etemplate/inc/class.soetemplate.inc.php index 4d19902c72..5411599709 100644 --- a/etemplate/inc/class.soetemplate.inc.php +++ b/etemplate/inc/class.soetemplate.inc.php @@ -182,7 +182,7 @@ ); if ($attributes && is_array($attributes)) { - return array_merge($attributes,$cell); + $cell += $attributes; } return $cell; }