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

Reorg code install

Browse Source
This commit is contained in:
Laurent Destailleur 2006-10-20 22:21:46 +00:00
parent c51e43593d
commit d7077ea640
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/etape1.php
View File

@ -134,7 +134,7 @@ if ($_POST["action"] == "set")
if (file_exists("$conffile")) if (file_exists("$conffile"))
{ {
include_once("$conffile"); include("$conffile"); // On force rechargement. Ne pas mettre include_once !
print "<tr><td>".$langs->trans("ConfigurationSaving")."</td><td>".$langs->trans("OK")."</td>"; print "<tr><td>".$langs->trans("ConfigurationSaving")."</td><td>".$langs->trans("OK")."</td>";
} }
else else

9
htdocs/install/inc.php
View File

@ -33,9 +33,12 @@ $conffile = "../conf/conf.php";
if (file_exists($conffile)) if (file_exists($conffile))
{ {
include_once($conffile); include_once($conffile);
require_once($dolibarr_main_document_root . "/conf/conf.class.php"); if ($dolibarr_main_document_root)
require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php"); {
$conf=new Conf(); require_once($dolibarr_main_document_root . "/conf/conf.class.php");
require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php");
$conf=new Conf();
}
} }
if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_'; if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_';
define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix); define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix);