CRM-16408 add back block for all non-wp CMS. Correction PR 6807
authorKevin Cristiano <kcristiano@tadpole.cc>
Fri, 27 Nov 2015 02:13:16 +0000 (21:13 -0500)
committerKevin Cristiano <kcristiano@tadpole.cc>
Fri, 27 Nov 2015 02:13:16 +0000 (21:13 -0500)
----------------------------------------
* CRM-16408: Installer rewrite
  https://issues.civicrm.org/jira/browse/CRM-16408

install/index.php

index 1d795e764dc052119a0c1c0674ea64512641e16c..adc88051aed2ef3faedb7c11647d495ec5a9bbcd 100644 (file)
@@ -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') {