Commit e80888ae authored by Gábor Hojtsy's avatar Gábor Hojtsy

#141637 follow up patch by merlinofchaos: proper placement of menu_rebuild()...

#141637 follow up patch by merlinofchaos: proper placement of menu_rebuild() to not run twice on the same request
parent adab4ab8
......@@ -615,8 +615,6 @@ function install_tasks($profile, $task) {
if ($task == 'configure') {
drupal_set_title(st('Configure site'));
// Build menu to allow clean URL check.
menu_rebuild();
// We break the form up so we can tell when it's been successfully
// submitted.
......@@ -641,6 +639,8 @@ function install_tasks($profile, $task) {
drupal_process_form('install_configure_form', $form, $form_state);
if (empty($form_state['redirect'])) {
// Build menu to allow clean URL check.
menu_rebuild();
$output = drupal_render_form('install_configure_form', $form);
}
else {
......
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