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

#141637 by merlinofchaos and yched: follow up fixes to the installer patch,...

#141637 by merlinofchaos and yched: follow up fixes to the installer patch, properly rebuilding the menu when done and returning update results
parent 21fe511d
......@@ -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'),
);
......
......@@ -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();
}
......
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