mirror of
https://github.com/silverstripe/silverstripe-installer
synced 2024-10-22 15:05:33 +00:00
Fix notice level errors in command-line installation used in tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@64465 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
320c7179b0
commit
76a6b8f3a4
@ -6,7 +6,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
ini_set('max_execution_time', 300);
|
ini_set('max_execution_time', 300);
|
||||||
|
error_reporting(E_ALL ^ E_NOTICE);
|
||||||
session_start();
|
session_start();
|
||||||
|
|
||||||
// Include environment files
|
// Include environment files
|
||||||
@ -24,7 +24,7 @@ foreach($envFiles as $envFile) {
|
|||||||
if(isset($_REQUEST['mysql'])) {
|
if(isset($_REQUEST['mysql'])) {
|
||||||
$databaseConfig = $_REQUEST['mysql'];
|
$databaseConfig = $_REQUEST['mysql'];
|
||||||
} else {
|
} else {
|
||||||
$databaseConfig = array(
|
$_REQUEST['mysql'] = $databaseConfig = array(
|
||||||
"type" => "MySQLDatabase",
|
"type" => "MySQLDatabase",
|
||||||
"server" => defined('SS_DATABASE_SERVER') ? SS_DATABASE_SERVER : "localhost",
|
"server" => defined('SS_DATABASE_SERVER') ? SS_DATABASE_SERVER : "localhost",
|
||||||
"username" => defined('SS_DATABASE_USERNAME') ? SS_DATABASE_USERNAME : "root",
|
"username" => defined('SS_DATABASE_USERNAME') ? SS_DATABASE_USERNAME : "root",
|
||||||
@ -36,7 +36,7 @@ if(isset($_REQUEST['mysql'])) {
|
|||||||
if(isset($_REQUEST['admin'])) {
|
if(isset($_REQUEST['admin'])) {
|
||||||
$adminConfig = $_REQUEST['admin'];
|
$adminConfig = $_REQUEST['admin'];
|
||||||
} else {
|
} else {
|
||||||
$adminConfig = array(
|
$_REQUEST['admin'] = $adminConfig = array(
|
||||||
'username' => 'admin',
|
'username' => 'admin',
|
||||||
'password' => 'password',
|
'password' => 'password',
|
||||||
'firstname' => '',
|
'firstname' => '',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user