From 46a92aef554a9e01751d9ebe23ad537b3bb05f52 Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Fri, 16 Jul 2010 09:05:25 +0000 Subject: [PATCH] Properly connect to the database BEFORE trying to create the admin account ! SVN:trunk[610] --- setup/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/index.php b/setup/index.php index 47fd698cc..99b55dc8a 100644 --- a/setup/index.php +++ b/setup/index.php @@ -411,7 +411,7 @@ function CreateDatabaseStructure(SetupWebPage $oP, Config $oConfig, $sDBName, $s function CreateAdminAccount(SetupWebPage $oP, Config $oConfig, $sAdminUser, $sAdminPwd, $sLanguage) { $oP->log('Info - CreateAdminAccount'); - InitDataModel($oP, TMP_CONFIG_FILE, true); // load data model only + InitDataModel($oP, TMP_CONFIG_FILE, false); // load data model and connect to the database if (UserRights::CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage)) { $oP->ok("Administrator account '$sAdminUser' created."); @@ -892,6 +892,7 @@ function SampleDataSelection(SetupWebPage $oP, $aParamValues, $iCurrentStep, Con $sAdminPwd = $aParamValues['auth_pwd']; $sLanguage = $aParamValues['language']; $oConfig->SetDefaultLanguage($aParamValues['language']); + echo "DB Name: ".$oConfig->GetDBName()."

\n"; $oConfig->WriteToFile(TMP_CONFIG_FILE); $oP->add("
\n");