From 1d59a4e89c5b52c9ba45d462a3b8fdb3ec7da13b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Dec 2008 00:04:11 +0000 Subject: [PATCH] Can use several root directories. --- htdocs/install/inc.php | 5 ++++- htdocs/support/inc.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 335e4c5c8df..f497a9763ad 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -106,8 +106,11 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile)) } } + +// Define prefix if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_'; define('MAIN_DB_PREFIX',(isset($dolibarr_main_db_prefix)?$dolibarr_main_db_prefix:'')); + define('DOL_DATA_ROOT',(isset($dolibarr_main_data_root)?$dolibarr_main_data_root:'')); if (empty($conf->character_set_client)) $conf->character_set_client=$charset; if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='latin1_swedish_ci'; @@ -168,7 +171,7 @@ if (function_exists('get_magic_quotes_gpc')) // magic_quotes_* plus pris en comp } // Defini objet langs -$langs = new Translate('../langs',$conf); +$langs = new Translate('..',$conf); $langs->setDefaultLang('auto'); $langs->setPhpLang(); diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index ef895b84e37..cf72bfb9b3e 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -137,7 +137,7 @@ if (function_exists('get_magic_quotes_gpc')) // magic_quotes_* plus pris en comp } // Defini objet langs -$langs = new Translate('../langs',$conf); +$langs = new Translate('..',$conf); $langs->setDefaultLang('auto'); $langs->setPhpLang();