From 4dafc577cc8de7fbd039a22f6f32e60b310368e2 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Tue, 31 Jan 2012 02:51:45 -0800
Subject: Issue #996236 by fago, sun, pillarsdotnet, xjm: Fixed
 drupal_flush_all_caches() does not clear entity info cache.

---
 includes/common.inc | 1 +
 includes/module.inc | 1 +
 2 files changed, 2 insertions(+)

(limited to 'includes')

diff --git a/includes/common.inc b/includes/common.inc
index 5e90f78f1..43e211813 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -7244,6 +7244,7 @@ function drupal_flush_all_caches() {
   system_rebuild_theme_data();
   drupal_theme_rebuild();
 
+  entity_info_cache_clear();
   node_types_rebuild();
   // node_menu() defines menu items based on node types so it needs to come
   // after node types are rebuilt.
diff --git a/includes/module.inc b/includes/module.inc
index 633b317f6..77e35b7b0 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -539,6 +539,7 @@ function module_disable($module_list, $disable_dependents = TRUE) {
     system_list_reset();
     module_list(TRUE);
     module_implements('', FALSE, TRUE);
+    entity_info_cache_clear();
     // Invoke hook_modules_disabled before disabling modules,
     // so we can still call module hooks to get information.
     module_invoke_all('modules_disabled', $invoke_modules);
-- 
cgit v1.2.3