diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-04-27 12:59:16 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-04-27 12:59:16 +0000 |
| commit | 6f6db7429616ec5ec968f1151ec2ebf8ddc1bddd (patch) | |
| tree | f8695ea93beb8061bcbb50a875fa15dde4ed81da /modules | |
| parent | 070400577d38da5347f3298939f95f9c039d97c9 (diff) | |
| download | brdo-6f6db7429616ec5ec968f1151ec2ebf8ddc1bddd.tar.gz brdo-6f6db7429616ec5ec968f1151ec2ebf8ddc1bddd.tar.bz2 | |
- Patch #683988 by catch, dww, aspilicious: failure to clear the system_list() entry from {cache_bootstrap()} results in bogus results when you upgrade a module.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/system/system.admin.inc | 1 | ||||
| -rw-r--r-- | modules/system/system.module | 5 |
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(); } /** |