diff options
| -rw-r--r-- | install.php | 4 | ||||
| -rw-r--r-- | modules/system/system.install | 4 |
2 files changed, 6 insertions, 2 deletions
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'), ); diff --git a/modules/system/system.install b/modules/system/system.install index b1fda9b22..4a33350be 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -3871,6 +3871,8 @@ function system_update_6013() { // Rebuild system table contents. module_rebuild_cache(); system_theme_data(); + + return array(); } /** @@ -3879,6 +3881,8 @@ function system_update_6013() { */ function system_update_6014() { variable_set('install_task', 'done'); + + return array(); } |