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

test

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-09-29 18:40:36 +02:00
parent cedad3dc26
commit 4bac865205
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/societe/class/societe.class.php
View File

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