summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2007-05-15 19:44:23 (GMT)
committerGábor Hojtsy2007-05-15 19:44:23 (GMT)
commite80888ae258e854d5a9b29a411e4cc2983136bce (patch)
treeed0932e0f1b9984438d538406f2c9dda4304f9f9
parentadab4ab83bfcb3deede5d5aa5a4965e161856119 (diff)
#141637 follow up patch by merlinofchaos: proper placement of menu_rebuild() to not run twice on the same request
-rw-r--r--install.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/install.php b/install.php
index b52dfbb..981def2 100644
--- a/install.php
+++ b/install.php
@@ -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 {