summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Rossouw2008-07-10 01:27:02 (GMT)
committeradrian2008-07-10 01:27:02 (GMT)
commit492c28acb3e54ed2cde290e97b9726b0a19a4efa (patch)
tree804f9f9771015df93c1bae78f9337f9eb009a872
parent476d2a81b02b3344572911c3c55849cdd12f8676 (diff)
Ensure that including settings.php from imported sites, to get their settings, to not modify the php ini_set environment5.x-0.1-alpha3
-rw-r--r--platform/provision_drupal.module5
-rw-r--r--provision.module3
2 files changed, 5 insertions, 3 deletions
diff --git a/platform/provision_drupal.module b/platform/provision_drupal.module
index 9419976..ce3fd8c 100644
--- a/platform/provision_drupal.module
+++ b/platform/provision_drupal.module
@@ -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;
}
diff --git a/provision.module b/provision.module
index 253600c..f9e74b8 100644
--- a/provision.module
+++ b/provision.module
@@ -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',