From 514b92c91e1e0f63a972369e507183a1fc8916cb Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 4 Jun 2015 12:33:06 -0400
Subject: [PATCH] CRM-16577 - Clear caches more thoroughly from
 UpdateConfigBackend

---
 CRM/Admin/Form/Setting/UpdateConfigBackend.php | 4 +++-
 CRM/Utils/Cache.php                            | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CRM/Admin/Form/Setting/UpdateConfigBackend.php b/CRM/Admin/Form/Setting/UpdateConfigBackend.php
index 7508d3aae6..6164a7da1c 100644
--- a/CRM/Admin/Form/Setting/UpdateConfigBackend.php
+++ b/CRM/Admin/Form/Setting/UpdateConfigBackend.php
@@ -115,8 +115,10 @@ class CRM_Admin_Form_Setting_UpdateConfigBackend extends CRM_Admin_Form_Setting
       // cleanup templates_c directory
       $config->cleanup(1, FALSE);
 
-      // clear db caching
+      // clear all caches
       CRM_Core_Config::clearDBCache();
+      CRM_Utils_System::flushCache();
+
       parent::rebuildMenu();
 
       CRM_Core_BAO_WordReplacement::rebuild();
diff --git a/CRM/Utils/Cache.php b/CRM/Utils/Cache.php
index 94b2cfb4ee..abe356bab3 100644
--- a/CRM/Utils/Cache.php
+++ b/CRM/Utils/Cache.php
@@ -83,7 +83,6 @@ class CRM_Utils_Cache {
 
       // a generic method for utilizing any of the available db caches.
       $dbCacheClass = 'CRM_Utils_Cache_' . $className;
-      require_once str_replace('_', DIRECTORY_SEPARATOR, $dbCacheClass) . '.php';
       $settings = self::getCacheSettings($className);
       self::$_singleton = new $dbCacheClass($settings);
     }
-- 
2.25.1