Skip to content
Snippets Groups Projects
Commit fdda3198 authored by Regis Houssin's avatar Regis Houssin
Browse files

Fix: bug

parent 21e44be7
No related branches found
No related tags found
No related merge requests found
...@@ -392,7 +392,7 @@ class Contact extends CommonObject ...@@ -392,7 +392,7 @@ class Contact extends CommonObject
$sql.= " c.fk_pays, p.libelle as pays, p.code as pays_code,"; $sql.= " c.fk_pays, p.libelle as pays, p.code as pays_code,";
$sql.= " c.birthday,"; $sql.= " c.birthday,";
$sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid,"; $sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid,";
$sql.= " c.priv, c.note, c.default_lang"; $sql.= " c.priv, c.note, c.default_lang,";
$sql.= " u.rowid as user_id, u.login as user_login,"; $sql.= " u.rowid as user_id, u.login as user_login,";
$sql.= " s.nom as socname, s.address as socaddress, s.cp as soccp, s.ville as soccity, s.default_lang as socdefault_lang"; $sql.= " s.nom as socname, s.address as socaddress, s.cp as soccp, s.ville as soccity, s.default_lang as socdefault_lang";
$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
......
...@@ -1259,7 +1259,7 @@ else ...@@ -1259,7 +1259,7 @@ else
if ($conf->global->MAIN_MULTILANGS) if ($conf->global->MAIN_MULTILANGS)
{ {
$langs->load("languages"); $langs->load("languages");
$labellang=$langs->trans('Language_'.$soc->default_lang).' ('.$soc->default_lang.')'; $labellang = ($soc->default_lang?$langs->trans('Language_'.$soc->default_lang).' ('.$soc->default_lang.')':'');
print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'.$labellang.'</td></tr>'; print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'.$labellang.'</td></tr>';
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment