Commit 492c28ac authored by Adrian Rossouw's avatar Adrian Rossouw Committed by adrian

Ensure that including settings.php from imported sites, to get their settings,...

Ensure that including settings.php from imported sites, to get their settings, to not modify the php ini_set environment
parent 476d2a81
......@@ -416,7 +416,10 @@ function _provision_drupal_import_site($url) {
$data['site_profile'] = $installed_profile;
$data['site_installed'] = TRUE;
provision_save_site_data($url, $data);
}
}
//Just make sure our ini settings and the like aren't wiped out.
include("sites/" . conf_path() . "/settings.php");
return $data;
}
......@@ -92,9 +92,8 @@ function provision_init() {
$command = $test;
}
}
define('PROVISION_RESTART_CMD', variable_get('provision_restart_cmd', "sudo $command graceful"));
global $base_url;
define('PROVISION_BASE_URL', $base_url);
define('PROVISION_WEB_DISABLE_URL',
......
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