From b09fbd8e504a941aa27140ed8eaf467d3d88ad17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Fri, 11 May 2007 07:33:46 +0000
Subject: #141637 by merlinofchaos and yched: follow up fixes to the installer
 patch, properly rebuilding the menu when done and returning update results

---
 install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'install.php')

diff --git a/install.php b/install.php
index 453fed165..de62188db 100644
--- a/install.php
+++ b/install.php
@@ -584,7 +584,6 @@ function install_tasks($profile, $task) {
 
   if ($task == 'configure') {
     drupal_set_title(st('Configure site'));
-    menu_rebuild();
 
     // We break the form up so we can tell when it's been successfully
     // submitted.
@@ -634,6 +633,7 @@ function install_tasks($profile, $task) {
 
     // The end of the install process. Remember profile used.
     if ($task == 'done') {
+      menu_rebuild();
       variable_set('install_profile', $profile);
     }
 
@@ -679,7 +679,7 @@ function install_task_list($active = NULL) {
     'profile' => st('Choose profile'),
     'locale' => st('Choose language'),
     'requirements' => st('Verify requirements'),
-    'database' => st('Database setup'),
+    'database' => st('Setup database'),
     'configure' => st('Configure site'),
   );
 
-- 
cgit v1.2.3