mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-13 17:00:45 +01:00
fixed php5.2.6 problem: unknown type ''
This commit is contained in:
parent
ecd3948175
commit
f66e2e4004
File diff suppressed because it is too large
Load Diff
@ -171,7 +171,7 @@ class soetemplate
|
|||||||
);
|
);
|
||||||
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