Merge pull request #15305 from yashodha/CRM_21777

[civicrm-core.git] / CRM / Utils / System.php

diff --git a/CRM/Utils/System.php b/CRM/Utils/System.php
index 2ba2d976d1fe7b8fe1e5169b494ede10a98cc487..b52932368805f2c7f3579531484d4921059661bf 100644 (file)
--- a/CRM/Utils/System.php
+++ b/CRM/Utils/System.php
@@ -53,7 +53,6 @@
  * @method static array synchronizeUsers() Create CRM contacts for all existing CMS users.
  * @method static appendCoreResources(\Civi\Core\Event\GenericHookEvent $e) Callback for hook_civicrm_coreResourceList.
  * @method static alterAssetUrl(\Civi\Core\Event\GenericHookEvent $e) Callback for hook_civicrm_getAssetUrl.
- * @method static sendResponse(\Psr\Http\Message\ResponseInterface $response) function to handle RepsoseInterface for delivering HTTP Responses.
  */
 class CRM_Utils_System {
 
@@ -1440,6 +1439,10 @@ class CRM_Utils_System {
       Civi::cache('js_strings')->flush();
       Civi::cache('community_messages')->flush();
       Civi::cache('groups')->flush();
+      Civi::cache('navigation')->flush();
+      Civi::cache('customData')->flush();
+      Civi::cache('contactTypes')->clear();
+      Civi::cache('metadata')->clear();
       CRM_Extension_System::singleton()->getCache()->flush();
       CRM_Cxn_CiviCxnHttp::singleton()->getCache()->flush();
     }
@@ -1447,7 +1450,7 @@ class CRM_Utils_System {
     // also reset the various static memory caches
 
     // reset the memory or array cache
-    CRM_Core_BAO_Cache::deleteGroup('contact fields', NULL, FALSE);
+    Civi::cache('fields')->flush();
 
     // reset ACL cache
     CRM_ACL_BAO_Cache::resetCache();