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

Fix: Setup load and check must be in master (used by GUI and Command line scripts) and not in main (used by GUI only)

Browse Source
This commit is contained in:
Laurent Destailleur 2008-03-17 02:53:48 +00:00
parent 31b53abcd4
commit 0ba4714d13
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/master.inc.php
View File

@ -59,31 +59,14 @@ else
//error_reporting(E_ALL);
error_reporting(E_ALL ^ E_NOTICE);
// Test si install ok
/*
if (! isset($dolibarr_main_db_host))
// Include configuration
if (! @include_once("conf/conf.php") || empty($dolibarr_main_db_host))
{
print 'Error: Dolibarr setup was run but was not completed.<br>'."\n";
print 'Please, run <a href="install/index.php">Dolibarr install process</a> until the end...'."\n";
exit;
}
*/
// Régression temporaire
if (! @include_once("conf/conf.php")) // FIXME: Ce test est inutile car si le test renvoi vrai le suivant aussi. Seul le suivant est utile.
{
Header("Location: install/index.php");
exit;
}
else
{
if (! isset($dolibarr_main_db_host))
{
Header("Location: install/index.php");
exit;
}
}
//Fin régression
if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql'
if (empty($dolibarr_main_data_root))