lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

work on user

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-09-12 18:41:26 +02:00
parent 34f928556d
commit e4a0de245a
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/adherents/class/adherent.class.php
View File

@ -1334,7 +1334,8 @@ class Adherent extends CommonObject
$arraysocialnetworks['linkedin'] = $obj->linkedin; $arraysocialnetworks['linkedin'] = $obj->linkedin;
$updatesocial = true; $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) { if ($updatesocial) {
$sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'adherent SET skype=null'; $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'adherent SET skype=null';
$sqlupd .= ', twitter=null'; $sqlupd .= ', twitter=null';

3
htdocs/user/class/user.class.php
View File

@ -399,7 +399,8 @@ class User extends CommonObject
$arraysocialnetworks['linkedin'] = $obj->linkedin; $arraysocialnetworks['linkedin'] = $obj->linkedin;
$updatesocial = true; $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) { if ($updatesocial) {
$sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'user SET skype=null'; $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'user SET skype=null';
$sqlupd .= ', twitter=null'; $sqlupd .= ', twitter=null';