From 32a8c261649a4396de40ec1cae3d603ba3161312 Mon Sep 17 00:00:00 2001 From: sminnee Date: Thu, 17 Jan 2008 05:31:14 +0000 Subject: [PATCH] Fixed admin credentials setting from 'make install' and 'make test' Added the contents of assets/ to svn:ignore git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@48168 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- install.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install.php b/install.php index 35a861e..bfdb9ec 100644 --- a/install.php +++ b/install.php @@ -690,8 +690,8 @@ PHP $dbAdmin = new DatabaseAdmin(); $dbAdmin->init(); - $_REQUEST['username'] = $_REQUEST['admin']['username']; - $_REQUEST['password'] = $_REQUEST['admin']['password']; + $_REQUEST['username'] = $config['admin']['username']; + $_REQUEST['password'] = $config['admin']['password']; $dbAdmin->doBuild(true); $adminmember = DataObject::get_one('Member',"`Email`= '".$_REQUEST['admin']['username']."'"); @@ -704,8 +704,8 @@ PHP echo "
  • Checking mod_rewrite works
    • "; - $_SESSION['username'] = $_REQUEST['admin']['username']; - $_SESSION['password'] = $_REQUEST['admin']['password']; + $_SESSION['username'] = $config['admin']['username']; + $_SESSION['password'] = $config['admin']['password']; if($this->checkModRewrite()) { if($this->errors) {