diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 55c098984c1..8f737057ccd 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -24,18 +24,6 @@ * */ -if (! @include_once("conf/conf.php")) -{ - Header("Location: install/index.php"); -} -else -{ - if (! isset($dolibarr_main_db_host)) - { - Header("Location: install/index.php"); - } -} - require("master.inc.php"); // Verification du login. diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 116fe6a4e4c..4c84c1ed1ea 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -24,7 +24,17 @@ define('DOL_VERSION','1.2.0-DEV'); - +if (! @include_once("conf/conf.php")) +{ + Header("Location: install/index.php"); +} +else +{ + if (! isset($dolibarr_main_db_host)) + { + Header("Location: install/index.php"); + } +} define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root); define('DOL_DATA_ROOT', $dolibarr_main_data_root);