#141637 follow up patch by merlinofchaos: proper placement of menu_rebuild() to not run twice on the same request
parent
adab4ab83b
commit
e80888ae25
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue