From e7bf24e861cd7beb8886f56bc091a9a42294e52e Mon Sep 17 00:00:00 2001 From: Kevin Cristiano Date: Mon, 12 Oct 2015 16:28:04 -0400 Subject: [PATCH] CRM-16408 add check for prior and current location for variable ---------------------------------------- * CRM-16408: Installer rewrite https://issues.civicrm.org/jira/browse/CRM-16408 CRM-16408 add check for prior and current location for variable ---------------------------------------- * CRM-16408: Installer rewrite https://issues.civicrm.org/jira/browse/CRM-16408 --- install/index.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/install/index.php b/install/index.php index f15e995e72..c70deebe32 100644 --- a/install/index.php +++ b/install/index.php @@ -192,9 +192,14 @@ elseif ($installType == 'wordpress') { $cmsPath = WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . 'civicrm'; $upload_dir = wp_upload_dir(); $files_dirname = $upload_dir['basedir'] . DIRECTORY_SEPARATOR . 'civicrm'; - $alreadyInstalled = file_exists($cmsPath . CIVICRM_DIRECTORY_SEPARATOR . - 'civicrm.settings.php' - ); + $wp_civi_settings = $upload_dir['basedir'] . DIRECTORY_SEPARATOR . 'civicrm' . DIRECTORY_SEPARATOR . 'civicrm.settingsphp'; + $wp_civi_settings_deprectated = CIVICRM_PLUGIN_DIR . 'civicrm.settings.php'; + if (file_exists($wp_civi_settings_deprectated)) { + $alreadyInstalled = $wp_civi_settings_deprectated; + } + elseif (file_exists($wp_civi_settings)) { + $alreadyInstalled = $wp_civi_settings; + } } if ($installType == 'drupal') { -- 2.25.1