Commit b9c4901d authored by Gerhard Killesreiter's avatar Gerhard Killesreiter

#59479, Install system can cause module code to run before install hook is run, patch by JonBob

parent 45785f96
......@@ -1006,7 +1006,6 @@ function system_modules_submit($form_id, $edit) {
}
module_list(TRUE, FALSE);
menu_rebuild();
include './includes/install.inc';
foreach ($new_modules as $module) {
......@@ -1018,6 +1017,8 @@ function system_modules_submit($form_id, $edit) {
}
}
menu_rebuild();
drupal_set_message(t('The configuration options have been saved.'));
return 'admin/modules';
}
......
......@@ -1006,7 +1006,6 @@ function system_modules_submit($form_id, $edit) {
}
module_list(TRUE, FALSE);
menu_rebuild();
include './includes/install.inc';
foreach ($new_modules as $module) {
......@@ -1018,6 +1017,8 @@ function system_modules_submit($form_id, $edit) {
}
}
menu_rebuild();
drupal_set_message(t('The configuration options have been saved.'));
return 'admin/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