From 1ef3a676441be253e372c7400971bc598700fa44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 29 Sep 2019 19:26:25 +0200 Subject: [PATCH] test --- htdocs/societe/class/societe.class.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 0c02ea4dcbd..20b27c9be41 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1385,11 +1385,7 @@ class Societe extends CommonObject $updatesocial = true; } $socialarray = ((is_null($obj->socialnetworks) || $obj->socialnetworks=='')?array():json_decode($obj->socialnetworks, true)); - if (is_array($socialarray)) { - $this->socialnetworks = array_merge($arraysocialnetworks, $socialarray); - } else { - $this->socialnetworks = $arraysocialnetworks; - } + $this->socialnetworks = array_merge($arraysocialnetworks, $socialarray); if ($updatesocial) { $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'societe SET skype=null'; $sqlupd .= ', twitter=null'; @@ -3611,10 +3607,10 @@ class Societe extends CommonObject $this->country_id=1; $this->country_code='FR'; $this->email='specimen@specimen.com'; - $this->skype='tom.hanson'; - $this->twitter='tomhanson'; - $this->facebook='tomhanson'; - $this->linkedin='tomhanson'; + // $this->skype='tom.hanson'; + // $this->twitter='tomhanson'; + // $this->facebook='tomhanson'; + // $this->linkedin='tomhanson'; $this->socialnetworks = array( 'skype' => 'tom.hanson', 'twitter' => 'tomhanson',