Commit 5d7a7356 authored by Dries's avatar Dries

- Patch #929178 by carlos8f, chx: module_list() kills system_list() caching.

parent 99ccb2e5
......@@ -65,9 +65,11 @@ function module_list($refresh = FALSE, $bootstrap = FALSE, $sort = FALSE, $fixed
}
}
else {
// As this is the $refresh case, make sure that system_list() returns
// fresh data.
system_list_reset();
if ($refresh) {
// For the $refresh case, make sure that system_list() returns fresh
// data.
drupal_static_reset('system_list');
}
if ($bootstrap) {
$list = system_list('bootstrap');
}
......@@ -391,6 +393,7 @@ function module_enable($module_list, $enable_dependencies = TRUE) {
->condition('name', $module)
->execute();
// Refresh the module list to include it.
system_list_reset();
module_list(TRUE);
module_implements('', FALSE, TRUE);
_system_update_bootstrap_status();
......@@ -508,6 +511,7 @@ function module_disable($module_list, $disable_dependents = TRUE) {
if (!empty($invoke_modules)) {
// Refresh the module list to exclude the disabled modules.
system_list_reset();
module_list(TRUE);
module_implements('', FALSE, TRUE);
// Invoke hook_modules_disabled before disabling modules,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment