From af45ee1bc3ed6ae13f8f6e3e32c49ef867147352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Fri, 2 May 2014 16:51:25 +0200 Subject: [PATCH] Fixed problem with non existing variable $db and removed not used variable $conf --- htdocs/societe/class/societe.class.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index dc7488c733f..ff4dbc7762c 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -156,8 +156,6 @@ class Societe extends CommonObject */ public function __construct($db) { - global $conf; - $this->db = $db; $this->client = 0; @@ -2549,8 +2547,8 @@ class Societe extends CommonObject { dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_WARNING); include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; - $country_code=getCountry($country_id,2,$db); // This need a SQL request, but it's the old feature - $country_label=getCountry($country_id,0,$db); // This need a SQL request, but it's the old feature + $country_code=getCountry($country_id,2,$this->db); // This need a SQL request, but it's the old feature + $country_label=getCountry($country_id,0,$this->db); // This need a SQL request, but it's the old feature } } $this->country_id=$country_id;