fixed php5.2.6 problem: unknown type ''

This commit is contained in:
Ralf Becker 2008-06-22 07:16:40 +00:00
parent ecd3948175
commit f66e2e4004
2 changed files with 1018 additions and 1017 deletions

View File

@ -3,7 +3,9 @@
* eGroupWare eTemplate Extension - Nextmatch Widget
*
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @copyright 2002-8 by RalfBecker@outdoor-training.de
* @package etemplate
* @subpackage extensions
* @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker@outdoor-training.de>
* @version $Id$
@ -56,10 +58,6 @@
* 'csv_fields' => // I false=disable csv export, true or unset=enable it with auto-detected fieldnames,
* or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
* );
* @package etemplate
* @subpackage extensions
* @author RalfBecker-AT-outdoor-training.de
* @license GPL
*/
class nextmatch_widget
{
@ -198,13 +196,16 @@
}
if (self::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
{

View File

@ -171,7 +171,7 @@ class soetemplate
);
if ($attributes && is_array($attributes))
{
return array_merge($attributes,$cell);
$cell += $attributes;
}
return $cell;
}