MINOR Removed traces of "firstname" and "surname" from installer (these were removed in config-form in r101314) (from r101315)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112217 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
sminnee 2010-10-13 04:26:35 +00:00
parent 1af78e980d
commit 0cd20830fd

View File

@ -115,8 +115,6 @@ if(isset($_REQUEST['admin'])) {
$_REQUEST['admin'] = $adminConfig = array(
'username' => defined('SS_DEFAULT_ADMIN_USERNAME') ? SS_DEFAULT_ADMIN_USERNAME : 'admin',
'password' => defined('SS_DEFAULT_ADMIN_PASSWORD') ? SS_DEFAULT_ADMIN_PASSWORD : '',
'firstname' => $_REQUEST['admin']['firstname'],
'surname' => $_REQUEST['admin']['surname']
);
} else {
$adminConfig = $_REQUEST['admin'];
@ -125,8 +123,6 @@ if(isset($_REQUEST['admin'])) {
$_REQUEST['admin'] = $adminConfig = array(
'username' => defined('SS_DEFAULT_ADMIN_USERNAME') ? SS_DEFAULT_ADMIN_USERNAME : 'admin',
'password' => defined('SS_DEFAULT_ADMIN_PASSWORD') ? SS_DEFAULT_ADMIN_PASSWORD : '',
'firstname' => '',
'surname' => ''
);
}
@ -948,8 +944,6 @@ PHP
$adminMember->Email = $config['admin']['username'];
$adminMember->Password = $config['admin']['password'];
$adminMember->PasswordEncryption = Security::get_password_encryption_algorithm();
$adminMember->FirstName = $config['admin']['firstname'];
$adminMember->Surname = $config['admin']['surname'];
// @todo Exception thrown if database with admin already exists with same Email
try {