summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Rossouw2008-10-10 08:07:17 +0000
committeradrian2008-10-10 08:07:17 +0000
commit7c38ced07c72d00ed652b506326ca99f716bf7e4 (patch)
treedd0cbbc2725149e8523763ea80b7a1985988063b
parente0efc7043e590e9e33f145612ddcce7d35c50e25 (diff)
Restart apache after deleting site5.x-0.1-beta1
-rw-r--r--platform/provision_drupal.module4
-rw-r--r--web_server/provision_apache.module3
2 files changed, 4 insertions, 3 deletions
diff --git a/platform/provision_drupal.module b/platform/provision_drupal.module
index 31bc995..2d29a3d 100644
--- a/platform/provision_drupal.module
+++ b/platform/provision_drupal.module
@@ -454,9 +454,9 @@ function _provision_drupal_import_site($url) {
provision_set_active_db($db_url);
$install_profile = db_result(db_query("SELECT value FROM {variable} WHERE name='install_profile'"));
$data['site_profile'] = ($install_profile) ? unserialize($install_profile) : 'default';
- $has_locale = db_result(db_query("SELECT status FROM system WHERE type='module' AND name='locale'"));
+ $has_locale = db_result(db_query("SELECT status FROM {system} WHERE type='module' AND name='locale'"));
if ($has_locale) {
- $locale = db_result(db_query("SELECT locale FROM locales_meta WHERE isdefault=1 AND enabled=1"));
+ $locale = db_result(db_query("SELECT locale FROM {locales_meta} WHERE isdefault=1 AND enabled=1"));
}
$data['site_language'] = ($locale) ? ($locale) : 'en';
provision_close_active_db();
diff --git a/web_server/provision_apache.module b/web_server/provision_apache.module
index f4e9350..5e82e4d 100644
--- a/web_server/provision_apache.module
+++ b/web_server/provision_apache.module
@@ -219,7 +219,8 @@ function provision_apache_provision_post_install($url, &$data) {
}
function provision_apache_provision_delete($url, &$data) {
- return _provision_apache_delete_vhost_config($url, $data);
+ _provision_apache_delete_vhost_config($url, $data);
+ return _provision_apache_restart_apache();
}
/**