From c223223b9eeadd55c61274295075363bcb05b278 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 9 Jul 2019 15:19:31 -0700
Subject: [PATCH] CRM-20926 - Finish killing Config.IDS.ini

---
 CRM/Admin/Form/Setting.php |  4 ----
 install/index.php          | 10 ----------
 2 files changed, 14 deletions(-)

diff --git a/CRM/Admin/Form/Setting.php b/CRM/Admin/Form/Setting.php
index 8be5dcee1a..1a6f0304e3 100644
--- 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 9d86c115e1..13aadf8930 100644
--- 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']));
-- 
2.25.1