lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: dplacement de la cration de l'objet $langs

Browse Source
This commit is contained in:
Regis Houssin 2007-05-24 09:26:28 +00:00
parent 8ec0f64dcd
commit c6341e2df3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/master.inc.php
View File

@ -4,7 +4,7 @@
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * 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) 2005 Simon Tosser <simon@kornog-computing.com>
* Copyright (C) 2006 Andre Cianfarani <andre.cianfarani@acdeveloppement.net> * 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 ."/html.form.class.php");
require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.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"); require_once(DOL_DOCUMENT_ROOT ."/conf/conf.class.php");
if ($character_set_client ){ if ($character_set_client ){
$_SESSION['charset'] = $character_set_client; $_SESSION['charset'] = $character_set_client;
@ -157,13 +166,7 @@ $user = new User($db);
$conf->setValues($db); $conf->setValues($db);
/* /*
* Creation objet $langs * Chargement langage par défaut
*/
require_once(DOL_DOCUMENT_ROOT ."/translate.class.php");
$langs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
/*
* Chargement objet $langs
*/ */
$langs->setDefaultLang($conf->global->MAIN_LANG_DEFAULT); $langs->setDefaultLang($conf->global->MAIN_LANG_DEFAULT);
$langs->setPhpLang($conf->global->MAIN_LANG_DEFAULT); $langs->setPhpLang($conf->global->MAIN_LANG_DEFAULT);