tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 17:05:33 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101315 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
sharvey 2010-03-18 20:37:15 +00:00 committed by Sam Minnee
parent 7d152f0c33
commit 07ddefe9f7
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install.php
View File

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