From c6341e2df3881b3211a6e141d03cf7731907b8e1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 24 May 2007 09:26:28 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20d=E9placement=20de=20la=20cr=E9ation=20d?=
 =?UTF-8?q?e=20l'objet=20$langs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/master.inc.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 11ee76e3eaa..78e175ed6b2 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2006 Regis Houssin        <regis.houssin@cap-networks.com>
+ * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@cap-networks.com>
  * Copyright (C) 2005 	   Simon Tosser         <simon@kornog-computing.com> 
  * Copyright (C) 2006 	   Andre Cianfarani     <andre.cianfarani@acdeveloppement.net> 
  *
@@ -130,6 +130,15 @@ require_once(DOL_DOCUMENT_ROOT ."/menu.class.php");
 require_once(DOL_DOCUMENT_ROOT ."/html.form.class.php");
 require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php");
 
+/*
+ * Creation objet $langs
+ */
+require_once(DOL_DOCUMENT_ROOT ."/translate.class.php");
+$langs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+
+/*
+ *
+ */
 require_once(DOL_DOCUMENT_ROOT ."/conf/conf.class.php");
 if ($character_set_client ){
 	$_SESSION['charset'] = $character_set_client;
@@ -157,13 +166,7 @@ $user = new User($db);
 $conf->setValues($db);
 
 /*
- * Creation objet $langs
- */
-require_once(DOL_DOCUMENT_ROOT ."/translate.class.php");
-$langs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
-
-/*
- * Chargement objet $langs
+ * Chargement langage par défaut
  */
 $langs->setDefaultLang($conf->global->MAIN_LANG_DEFAULT);
 $langs->setPhpLang($conf->global->MAIN_LANG_DEFAULT);