From: Kevin Cristiano Date: Fri, 27 Nov 2015 02:13:16 +0000 (-0500) Subject: CRM-16408 add back block for all non-wp CMS. Correction PR 6807 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7267b6befba085ccf46844f8f70db3e264135d55;p=civicrm-core.git CRM-16408 add back block for all non-wp CMS. Correction PR 6807 ---------------------------------------- * CRM-16408: Installer rewrite https://issues.civicrm.org/jira/browse/CRM-16408 --- diff --git a/install/index.php b/install/index.php index 1d795e764d..adc88051ae 100644 --- a/install/index.php +++ b/install/index.php @@ -110,15 +110,22 @@ if (isset($_POST['mysql'])) { $databaseConfig = $_POST['mysql']; } else { - if ($installType == 'wordpress') { - //WP Database Data - $databaseConfig = array( - "server" => DB_HOST, - "username" => DB_USER, - "password" => DB_PASSWORD, - "database" => DB_NAME, - ); - } + $databaseConfig = array( + "server" => "localhost", + "username" => "civicrm", + "password" => "", + "database" => "civicrm", + ); +} + +if ($installType == 'wordpress') { + //WP Database Data + $databaseConfig = array( + "server" => DB_HOST, + "username" => DB_USER, + "password" => DB_PASSWORD, + "database" => DB_NAME, + ); } if ($installType == 'drupal') {