From 4bac865205c0c9b33e745e68ad3291850fd3f699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 29 Sep 2019 18:40:36 +0200
Subject: [PATCH] test

---
 htdocs/societe/class/societe.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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';