This commit is contained in:
Regis Houssin 2010-02-21 16:38:18 +00:00
parent 21e44be700
commit fdda3198e1
2 changed files with 2 additions and 2 deletions

View File

@ -392,7 +392,7 @@ class Contact extends CommonObject
$sql.= " c.fk_pays, p.libelle as pays, p.code as pays_code,";
$sql.= " c.birthday,";
$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.= " 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";

View File

@ -1259,7 +1259,7 @@ else
if ($conf->global->MAIN_MULTILANGS)
{
$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>';
}