From a3f942ff701a53ecca03974942f398a482ad80b9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 20 Feb 2011 12:09:37 +0000 Subject: [PATCH] Qual: Remove usage of deprecated properties --- htdocs/master.inc.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index e320f56c6a0..f0b968dd2b7 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -241,7 +241,6 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC')) $mysoc=new Societe($db); $mysoc->id=0; - $mysoc->nom=$conf->global->MAIN_INFO_SOCIETE_NOM; // TODO deprecated $mysoc->name=$conf->global->MAIN_INFO_SOCIETE_NOM; $mysoc->address=$conf->global->MAIN_INFO_SOCIETE_ADRESSE; $mysoc->zip=$conf->global->MAIN_INFO_SOCIETE_CP; @@ -272,7 +271,6 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC')) if (is_object($langs)) $mysoc->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label; $mysoc->pays=$mysoc->country; // TODO deprecated - $mysoc->tel=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL; // TODO deprecated $mysoc->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL; $mysoc->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX; $mysoc->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;