diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 4dcb9aaa34d..10bee1e926a 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -2,7 +2,7 @@ /* Copyright (C) 2004 Rodolphe Quiedeville * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Sebastien DiCintio - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,7 @@ /** \file htdocs/install/etape4.php + \ingroup install \brief Demande le login et mot de passe de l'administrateur Dolibarr \version $Id$ */ @@ -42,7 +43,7 @@ dolibarr_install_syslog("etape4: Entering etape4.php page"); // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin=''; -if (file_exists("../conf/conf.forced.php")) include_once("../conf/conf.forced.php"); +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 88fb4ca39a3..2021e7b51a3 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -45,7 +45,7 @@ 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"); +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); pHeader($langs->trans("ConfigurationFile"),"etape0");