diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 6a15de6e97a..0c02ea4dcbd 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1385,7 +1385,11 @@ class Societe extends CommonObject $updatesocial = true; } $socialarray = ((is_null($obj->socialnetworks) || $obj->socialnetworks=='')?array():json_decode($obj->socialnetworks, true)); - $this->socialnetworks = array_merge($arraysocialnetworks, $socialarray); + if (is_array($socialarray)) { + $this->socialnetworks = array_merge($arraysocialnetworks, $socialarray); + } else { + $this->socialnetworks = $arraysocialnetworks; + } if ($updatesocial) { $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'societe SET skype=null'; $sqlupd .= ', twitter=null';