diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 1e40d9c3145e53fc28323d60a8fa2e9f02491881..4e620069ee60ce40b7d86b10a7f84d2e8b63d9b8 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -60,11 +60,29 @@ else error_reporting(E_ALL ^ E_NOTICE); // Test si install ok +/* if (! isset($dolibarr_main_db_host)) { print "Error: Dolibarr setup is not complete.\n"; exit; } +*/ + +// R�gression temporaire +if (! @include_once("conf/conf.php")) +{ + 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))