summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc1
-rw-r--r--includes/module.inc1
2 files changed, 2 insertions, 0 deletions
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);