From e4a0de245a313e11974336a2d9b3f894b081822a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 12 Sep 2019 18:41:26 +0200 Subject: [PATCH] work on user --- htdocs/adherents/class/adherent.class.php | 3 ++- htdocs/user/class/user.class.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 6dbd466b220..eb3e225c4d6 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1334,7 +1334,8 @@ class Adherent extends CommonObject $arraysocialnetworks['linkedin'] = $obj->linkedin; $updatesocial = true; } - $this->socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true)); + $socialarray = ($obj->socialnetworks==''?array():json_decode($obj->socialnetworks, true)); + $this->socialnetworks = array_merge($arraysocialnetworks, $socialarray); if ($updatesocial) { $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'adherent SET skype=null'; $sqlupd .= ', twitter=null'; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 20a2fbb6fc2..cfb79cfc06f 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -399,7 +399,8 @@ class User extends CommonObject $arraysocialnetworks['linkedin'] = $obj->linkedin; $updatesocial = true; } - $this->socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true)); + $socialarray = ($obj->socialnetworks==''?array():json_decode($obj->socialnetworks, true)); + $this->socialnetworks = array_merge($arraysocialnetworks, $socialarray); if ($updatesocial) { $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'user SET skype=null'; $sqlupd .= ', twitter=null';