summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/system/system.admin.inc1
-rw-r--r--modules/system/system.module5
2 files changed, 5 insertions, 1 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 277fc3d70..cba2e3a34 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1240,7 +1240,6 @@ function system_modules_submit($form, &$form_state) {
registry_rebuild();
system_rebuild_theme_data();
drupal_theme_rebuild();
- cache_clear_all('system_list', 'cache_bootstrap');
node_types_rebuild();
menu_rebuild();
cache_clear_all('schema', 'cache');
diff --git a/modules/system/system.module b/modules/system/system.module
index a33807dfd..6947c0150 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -2173,6 +2173,11 @@ function system_update_files_database(&$files, $type) {
}
}
$query->execute();
+
+ // If any module or theme was moved to a new location, we need to reset the
+ // system_list() cache or we will continue to load the old copy, look for
+ // schema updates in the wrong place, etc.
+ system_list_reset();
}
/**