diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 9d0c6eb7c9a..88fb4ca39a3 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -36,6 +36,17 @@ $langs->setDefaultLang($setuplang); $langs->load("install"); +// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. +if (! isset($force_install_type)) $force_install_type=''; +if (! isset($force_install_port)) $force_install_port=''; +if (! isset($force_install_database)) $force_install_database=''; +if (! isset($force_install_createdatabase)) $force_install_createdatabase=''; +if (! isset($force_install_databaselogin)) $force_install_databaselogin=''; +if (! isset($force_install_databasepass)) $force_install_databasepass=''; +if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin=''; +if (! isset($force_install_databaserootpass)) $force_install_databaserootpass=''; +if (file_exists("../conf/conf.forced.php")) include_once("../conf/conf.forced.php"); + pHeader($langs->trans("ConfigurationFile"),"etape0"); @@ -181,7 +192,7 @@ $dolibarr_main_db_host = "localhost";