Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

test

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

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

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