diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 45c2767a19f..4dcb9aaa34d 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -17,14 +17,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \file htdocs/install/etape4.php \brief Demande le login et mot de passe de l'administrateur Dolibarr - \version $Revision$ + \version $Id$ */ @@ -42,6 +40,11 @@ $langs->load("install"); 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"); + + pHeader($langs->trans("AdminAccountCreation"),"etape5"); @@ -65,7 +68,7 @@ if ($db->ok == 1) { print '