mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-13 17:38:19 +01:00
quiten warning if $cell[size] is an array
This commit is contained in:
parent
f46e031933
commit
0dd58b36cf
@ -1052,7 +1052,7 @@ class etemplate extends boetemplate
|
|||||||
if ((int) $cell['tabindex']) $options .= ' tabindex="'.(int)$cell['tabindex'].'"';
|
if ((int) $cell['tabindex']) $options .= ' tabindex="'.(int)$cell['tabindex'].'"';
|
||||||
if ($cell['accesskey']) $options .= ' accesskey="'.html::htmlspecialchars($cell['accesskey']).'"';
|
if ($cell['accesskey']) $options .= ' accesskey="'.html::htmlspecialchars($cell['accesskey']).'"';
|
||||||
|
|
||||||
if (strchr($cell['size'],'$') || $cell['size'][0] == '@') // expand cell['size'] for the button-disabled-check now
|
if (is_string($cell['size']) && (strchr($cell['size'],'$') || $cell['size'][0] == '@')) // expand cell['size'] for the button-disabled-check now
|
||||||
{
|
{
|
||||||
$cell['size'] = $this->expand_name($cell['size'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
|
$cell['size'] = $this->expand_name($cell['size'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
|
||||||
}
|
}
|
||||||
@ -1077,7 +1077,7 @@ class etemplate extends boetemplate
|
|||||||
while ((!self::$types[$cell['type']] || !empty($sub_type)) && $this->haveExtension($type,'pre_process'))
|
while ((!self::$types[$cell['type']] || !empty($sub_type)) && $this->haveExtension($type,'pre_process'))
|
||||||
{
|
{
|
||||||
//echo "<p>pre_process($cell[name]/$cell[type])</p>\n";
|
//echo "<p>pre_process($cell[name]/$cell[type])</p>\n";
|
||||||
if (strchr($cell['size'],'$') || $cell['size'][0] == '@')
|
if (is_string($cell['size']) && (strchr($cell['size'],'$') || $cell['size'][0] == '@'))
|
||||||
{
|
{
|
||||||
$cell['size'] = $this->expand_name($cell['size'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
|
$cell['size'] = $this->expand_name($cell['size'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user