CRM-20926 - Finish killing Config.IDS.ini

diff --git a/CRM/Admin/Form/Setting.php b/CRM/Admin/Form/Setting.php
index 8be5dcee1ae318df793f7517b9853537d79c5858..1a6f0304e3e5bfdb2dec91947f8d143bf94302a5 100644 (file)
--- a/CRM/Admin/Form/Setting.php
+++ b/CRM/Admin/Form/Setting.php
@@ -147,10 +147,6 @@ class CRM_Admin_Form_Setting extends CRM_Core_Form {
 
     // rebuild menu items
     CRM_Core_Menu::store();
-
-    // also delete the IDS file so we can write a new correct one on next load
-    $configFile = $config->uploadDir . 'Config.IDS.ini';
-    @unlink($configFile);
   }
 
 }

diff --git a/install/index.php b/install/index.php
index 9d86c115e18545f3162d6f05d7afcf49852e245b..13aadf89302d3813051e4296382af3a61855031a 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -703,16 +703,6 @@ class InstallRequirements {
       $this->requireWriteable($dirName, $testDetails, TRUE);
     }
 
-    //check for Config.IDS.ini, file may exist in re-install
-    $configIDSiniDir = array($cmsPath, 'sites', $siteDir, 'files', 'civicrm', 'upload', 'Config.IDS.ini');
-
-    if (is_array($configIDSiniDir) && !empty($configIDSiniDir)) {
-      $configIDSiniFile = implode(CIVICRM_DIRECTORY_SEPARATOR, $configIDSiniDir);
-      if (file_exists($configIDSiniFile)) {
-        unlink($configIDSiniFile);
-      }
-    }
-
     // Check for rewriting
     if (isset($_SERVER['SERVER_SOFTWARE'])) {
       $webserver = strip_tags(trim($_SERVER['SERVER_SOFTWARE']));