From e287554b18a942ac2cd3cebfe95a256ae9410cba Mon Sep 17 00:00:00 2001 From: Sofian Benaissa Date: Fri, 28 Oct 2011 13:54:23 -0400 Subject: [PATCH] Correct drush_get_option usage in install.provision.inc and verify.provision.inc --- install.provision.inc | 10 +++++----- verify.provision.inc | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/install.provision.inc b/install.provision.inc index 742ca2d..e8f986a 100644 --- a/install.provision.inc +++ b/install.provision.inc @@ -19,7 +19,7 @@ function drush_civicrm_post_provision_install($url = null) { // Check if the CiviCRM code base is present in the platform // Note: after putting the code there, you need to verify // the platform. - $packages = drush_get_option('packages', 'platform'); + $packages = drush_get_option('packages', NULL, 'platform'); if (!array_key_exists('civicrm', $packages['base']['modules'])) { return; @@ -34,10 +34,10 @@ function drush_civicrm_post_provision_install($url = null) { drush_log(dt("Configuring site for civicrm support")); - $db_user = drush_get_option('db_user', 'site'); - $db_passwd = drush_get_option('db_passwd', 'site'); - $db_host = drush_get_option('db_host', 'site'); - $db_name = drush_get_option('db_name', 'site'); + $db_user = drush_get_option('db_user', NULL, 'site'); + $db_passwd = drush_get_option('db_passwd', NULL, 'site'); + $db_host = drush_get_option('db_host', NULL, 'site'); + $db_name = drush_get_option('db_name', NULL, 'site'); drush_set_option('dbuser', $db_user); drush_set_option('dbpass', $db_passwd); diff --git a/verify.provision.inc b/verify.provision.inc index 6bf33f5..56bcab5 100644 --- a/verify.provision.inc +++ b/verify.provision.inc @@ -45,10 +45,10 @@ function drush_civicrm_post_provision_verify($url = NULL) { drush_log(dt("CiviCRM: running post verify.")); - $db_user = drush_get_option('db_user', 'site'); - $db_passwd = drush_get_option('db_passwd', 'site'); - $db_host = drush_get_option('db_host', 'site'); - $db_name = drush_get_option('db_name', 'site'); + $db_user = drush_get_option('db_user', NULL, 'site'); + $db_passwd = drush_get_option('db_passwd', NULL, 'site'); + $db_host = drush_get_option('db_host', NULL, 'site'); + $db_name = drush_get_option('db_name', NULL, 'site'); // include civicrm installer helper file (otherwise PEAR DB.php will fail to include parts) $drupalRoot = drush_get_context('DRUSH_DRUPAL_ROOT'); -- 1.7.1