Commit 9178521b authored by wmortada's avatar wmortada

By default set CiviCRM database to be same as CMS database

parent 5eed9fbb
......@@ -313,18 +313,10 @@ elseif ($installType == 'wordpress') {
}
}
// Load civicrm database config
// 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
......@@ -371,6 +363,16 @@ if ($installType == 'backdrop') {
}
}
// By default set CiviCRM database to be same as CMS database
if (!isset($databaseConfig)) {
if (($installType == 'drupal') && (isset($drupalConfig))) {
$databaseConfig = $drupalConfig;
}
if (($installType == 'backdrop') && (isset($backdropConfig))) {
$databaseConfig = $backdropConfig;
}
}
// Check requirements
$req = new InstallRequirements();
$req->check();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment