Move database configuration later in the install process

diff --git a/install/index.php b/install/index.php
index 778899163a3dbf0206c4323d5c5efd45b76d0377..1beae84ffed1e14f5862b17371213fbdb5a48c4a 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -104,64 +104,6 @@ $pkgPath = $crmPath . DIRECTORY_SEPARATOR . 'packages';
 require_once $crmPath . '/CRM/Core/ClassLoader.php';
 CRM_Core_ClassLoader::singleton()->register();
 
-// Load civicrm database config
-if (isset($_POST['mysql'])) {
-  $databaseConfig = $_POST['mysql'];
-}
-else {
-  $databaseConfig = array(
-    "server"   => "localhost",
-    "username" => "civicrm",
-    "password" => "",
-    "database" => "civicrm",
-  );
-}
-
-if ($installType == 'wordpress') {
-  // 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') {
-  // Load drupal database config
-  if (isset($_POST['drupal'])) {
-    $drupalConfig = $_POST['drupal'];
-  }
-  else {
-    $drupalConfig = array(
-      "server" => "localhost",
-      "username" => "drupal",
-      "password" => "",
-      "database" => "drupal",
-    );
-  }
-}
-
-if ($installType == 'backdrop') {
-  // Load backdrop database config
-  if (isset($_POST['backdrop'])) {
-    $backdropConfig = $_POST['backdrop'];
-  }
-  else {
-    $backdropConfig = array(
-      "server" => "localhost",
-      "username" => "backdrop",
-      "password" => "",
-      "database" => "backdrop",
-    );
-  }
-}
-
 $loadGenerated = 0;
 if (isset($_POST['loadGenerated'])) {
   $loadGenerated = 1;
@@ -368,6 +310,64 @@ elseif ($installType == 'wordpress') {
   }
 }
 
+// Load civicrm database config
+if (isset($_POST['mysql'])) {
+    $databaseConfig = $_POST['mysql'];
+}
+else {
+    $databaseConfig = array(
+        "server"   => "localhost",
+        "username" => "civicrm",
+        "password" => "",
+        "database" => "civicrm",
+    );
+}
+
+if ($installType == 'wordpress') {
+    // 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') {
+    // Load drupal database config
+    if (isset($_POST['drupal'])) {
+        $drupalConfig = $_POST['drupal'];
+    }
+    else {
+        $drupalConfig = array(
+            "server" => "localhost",
+            "username" => "drupal",
+            "password" => "",
+            "database" => "drupal",
+        );
+    }
+}
+
+if ($installType == 'backdrop') {
+    // Load backdrop database config
+    if (isset($_POST['backdrop'])) {
+        $backdropConfig = $_POST['backdrop'];
+    }
+    else {
+        $backdropConfig = array(
+            "server" => "localhost",
+            "username" => "backdrop",
+            "password" => "",
+            "database" => "backdrop",
+        );
+    }
+}
+
 // Check requirements
 $req = new InstallRequirements();
 $req->check();