From fdda3198e185f4905a6aa8ccd8b8e6fbb9d1685c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 21 Feb 2010 16:38:18 +0000
Subject: [PATCH] Fix: bug
---
htdocs/contact.class.php | 2 +-
htdocs/soc.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/contact.class.php b/htdocs/contact.class.php
index a9dc0c7efa8..00609254238 100644
--- a/htdocs/contact.class.php
+++ b/htdocs/contact.class.php
@@ -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";
diff --git a/htdocs/soc.php b/htdocs/soc.php
index 5d2a1c1f7ca..a0341eea8bf 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -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>';
}
--
GitLab