Commit 1e47bc07 authored by Adrian Rossouw's avatar Adrian Rossouw Committed by adrian

Correct order of bootstrapping and pre-setting the $_SERVER array

parent 708fa44d
...@@ -39,13 +39,12 @@ function drush_provision_drupal_pre_provision_install($url) { ...@@ -39,13 +39,12 @@ function drush_provision_drupal_pre_provision_install($url) {
*/ */
function drush_provision_drupal_provision_install($url) { function drush_provision_drupal_provision_install($url) {
// Requires at least the database settings to complete. // Requires at least the database settings to complete.
drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_SITE);
$fields = array('db_type', 'db_host', 'db_user', 'db_passwd', 'db_name'); $fields = array('db_type', 'db_host', 'db_user', 'db_passwd', 'db_name');
foreach ($fields as $key) { foreach ($fields as $key) {
$_SERVER[$key] = drush_get_option($key, null, 'site'); $_SERVER[$key] = drush_get_option($key, null, 'site');
} }
_provision_drupal_create_settings_file($url); _provision_drupal_create_settings_file($url);
drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_SITE);
drush_include_engine('drupal', 'install'); drush_include_engine('drupal', 'install');
drush_set_option('installed', TRUE, 'site'); drush_set_option('installed', TRUE, 'site');
......
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