#59479, Install system can cause module code to run before install hook is run, patch by JonBob
parent
45785f9610
commit
b9c4901d86
|
@ -1006,7 +1006,6 @@ function system_modules_submit($form_id, $edit) {
|
||||||
}
|
}
|
||||||
|
|
||||||
module_list(TRUE, FALSE);
|
module_list(TRUE, FALSE);
|
||||||
menu_rebuild();
|
|
||||||
|
|
||||||
include './includes/install.inc';
|
include './includes/install.inc';
|
||||||
foreach ($new_modules as $module) {
|
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.'));
|
drupal_set_message(t('The configuration options have been saved.'));
|
||||||
return 'admin/modules';
|
return 'admin/modules';
|
||||||
}
|
}
|
||||||
|
|
|
@ -1006,7 +1006,6 @@ function system_modules_submit($form_id, $edit) {
|
||||||
}
|
}
|
||||||
|
|
||||||
module_list(TRUE, FALSE);
|
module_list(TRUE, FALSE);
|
||||||
menu_rebuild();
|
|
||||||
|
|
||||||
include './includes/install.inc';
|
include './includes/install.inc';
|
||||||
foreach ($new_modules as $module) {
|
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.'));
|
drupal_set_message(t('The configuration options have been saved.'));
|
||||||
return 'admin/modules';
|
return 'admin/modules';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue