CRM-19729

Fix CiviCRM databaseConfig for WordPress.  Default to existing WP database, but allow override.  Thsi will ensure re-check requirements does not overwrite the settings

diff --git a/install/index.php b/install/index.php
index 276c1c4ca1304f467b660fe0c1e14e4bc31ea30c..ad024a88a828f876791b350674975750d4aaafe0 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -118,13 +118,18 @@ else {
 }
 
 if ($installType == 'wordpress') {
-  //WP Database Data
+  // Load WP database config
+  if (isset($_POST['mysql'])) {
+    $databaseConfig = $_POST['mysql'];
+  }
+  else {
   $databaseConfig = array(
     "server"   => DB_HOST,
     "username" => DB_USER,
     "password" => DB_PASSWORD,
     "database" => DB_NAME,
   );
+  }
 }
 
 if ($installType == 'drupal') {