summaryrefslogtreecommitdiffstats
path: root/platform/drupal/install_6.inc
diff options
context:
space:
mode:
Diffstat (limited to 'platform/drupal/install_6.inc')
-rw-r--r--platform/drupal/install_6.inc22
1 files changed, 14 insertions, 8 deletions
diff --git a/platform/drupal/install_6.inc b/platform/drupal/install_6.inc
index dc400ca..8ae004c 100644
--- a/platform/drupal/install_6.inc
+++ b/platform/drupal/install_6.inc
@@ -35,14 +35,18 @@ function install_verify_settings() {
// @todo why are we setting those variables if they are not
// reachable outside this scope?!
$url = parse_url(is_array($db_url) ? $db_url['default'] : $db_url);
- $db_user = urldecode($url['user']);
- $db_pass = urldecode($url['pass']);
- $db_host = urldecode($url['host']);
- $db_port = isset($url['port']) ? urldecode($url['port']) : '3306';
- $db_path = ltrim(urldecode($url['path']), '/');
- $settings_file = './'. conf_path() .'/settings.php';
-
- return TRUE;
+ if (!empty($url['user']) && !empty($url['pass']) && !empty($url['host'])) {
+ $db_user = urldecode($url['user']);
+ $db_pass = urldecode($url['pass']);
+ $db_host = urldecode($url['host']);
+ $db_port = isset($url['port']) ? urldecode($url['port']) : '3306';
+ $db_path = ltrim(urldecode($url['path']), '/');
+ $settings_file = './'. conf_path() .'/settings.php';
+ return TRUE;
+ }
+ else {
+ return FALSE;
+ }
}
return FALSE;
}
@@ -231,6 +235,7 @@ function install_main() {
db_query("INSERT INTO {system} (filename, name, type, owner, status, throttle, bootstrap, schema_version) VALUES('%s', '%s', '%s', '%s', %d, %d, %d, %d)", $system_path .'/system.module', 'system', 'module', '', 1, 0, 0, $system_version);
// Now that we've installed things properly, bootstrap the full Drupal environment
+ module_list(TRUE, FALSE);
module_rebuild_cache();
drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_FULL);
$modules = array_diff($modules, array('system'));
@@ -296,6 +301,7 @@ function install_main() {
if (function_exists($function)) {
while (!in_array($task, array('profile-finished', 'finished'))) {
drush_log(dt("Running profile specific task : !task", array('!task' => $task)));
+ module_list(TRUE, FALSE);
module_rebuild_cache();
module_load_all();
// stop batch api from re-directing. ever.