mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 08:34:29 +01:00
fix TypeError array_merge() parameter #1 must be of type array, string given
This commit is contained in:
parent
abb517de02
commit
f2a537be0a
@ -416,9 +416,9 @@ class Link extends Etemplate\Widget
|
|||||||
}
|
}
|
||||||
// Link widgets can share IDs, make sure to preserve values from others
|
// Link widgets can share IDs, make sure to preserve values from others
|
||||||
$already = self::get_array($validated, $form_name, false, true);
|
$already = self::get_array($validated, $form_name, false, true);
|
||||||
if($already != null)
|
if(!empty($already) && $already != $value)
|
||||||
{
|
{
|
||||||
$value = array_merge((array)$value, (already)$already);
|
$value = array_merge((array)$value, (array)$already);
|
||||||
}
|
}
|
||||||
// Automatically do link if user selected entry but didn't click 'Link' button
|
// Automatically do link if user selected entry but didn't click 'Link' button
|
||||||
$link = self::get_array($content, self::form_name($cname, $this->id . '_link_entry'));
|
$link = self::get_array($content, self::form_name($cname, $this->id . '_link_entry'));
|
||||||
|
Loading…
Reference in New Issue
Block a user