Skip to content

Fixed notice error defined CIVICRM_SETTINGS_PATH #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pradpnayak wants to merge 1 commit into
base: 7.x-master
Choose a base branch
from
+21 −15
Open

Fixed notice error defined CIVICRM_SETTINGS_PATH #667

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions drush/civicrm.drush.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1494,25 +1494,31 @@ function _civicrm_init($fail = TRUE, $load_config = TRUE) {
]));
}

global $cmsPath;
$cmsPath = $drupal_root = drush_get_context('DRUSH_DRUPAL_ROOT');
$site_root = drush_get_context('DRUSH_DRUPAL_SITE_ROOT', FALSE);
$civicrmSettingsFile = "$drupal_root/$site_root/civicrm.settings.php";

if (!file_exists($civicrmSettingsFile)) {
$sites_subdir = drush_get_option('sites-subdir', 'default');
$civicrmSettingsFile = "$drupal_root/sites/$sites_subdir/civicrm.settings.php";
if (defined('CIVICRM_SETTINGS_PATH')) {
$civicrmSettingsFile = CIVICRM_SETTINGS_PATH;
}
else {
global $cmsPath;
$cmsPath = $drupal_root = drush_get_context('DRUSH_DRUPAL_ROOT');
$site_root = drush_get_context('DRUSH_DRUPAL_SITE_ROOT', FALSE);
$civicrmSettingsFile = "$drupal_root/$site_root/civicrm.settings.php";

if (!file_exists($civicrmSettingsFile)) {
if ($fail) {
return drush_set_error('CIVICRM_INIT_SETTINGS_NOT_FOUND', dt('Could not locate civicrm settings file.'));
}
else {
return FALSE;
$sites_subdir = drush_get_option('sites-subdir', 'default');
$civicrmSettingsFile = "$drupal_root/sites/$sites_subdir/civicrm.settings.php";
if (!file_exists($civicrmSettingsFile)) {
if ($fail) {
return drush_set_error('CIVICRM_INIT_SETTINGS_NOT_FOUND', dt('Could not locate civicrm settings file.'));
}
else {
return FALSE;
}
}
}
// include settings file
define('CIVICRM_SETTINGS_PATH', $civicrmSettingsFile);
}
// include settings file
define('CIVICRM_SETTINGS_PATH', $civicrmSettingsFile);

include_once $civicrmSettingsFile;
global $civicrm_root;
if (!is_dir($civicrm_root)) {
Expand Down