db upgrades are now XHTML-correct -- at least when they succeed! With this patch, 1.8 installation completes correctly

This commit is contained in:
martinlanghoff 2007-01-04 01:07:35 +00:00
parent f3f7610c90
commit b776b27738
5 changed files with 11 additions and 1 deletions

View File

@ -351,6 +351,7 @@
notify(get_string("databasesuccess"), "green"); notify(get_string("databasesuccess"), "green");
notify(get_string("databaseupgradebackups", "", $backup_version), "green"); notify(get_string("databaseupgradebackups", "", $backup_version), "green");
print_continue($continueto); print_continue($continueto);
print_footer();
exit; exit;
} else { } else {
error("Upgrade of backup system failed! (Could not update version in config table)"); error("Upgrade of backup system failed! (Could not update version in config table)");

View File

@ -1,4 +1,4 @@
<?php //$Id: upgrade.php,v 1.2 2007/01/03 04:55:20 moodler Exp $ <?php //$Id$
// This file keeps track of upgrades to // This file keeps track of upgrades to
// groups // groups
@ -69,6 +69,7 @@ function upgrade_group_db($continueto) {
notify(get_string('databasesuccess'), 'green'); notify(get_string('databasesuccess'), 'green');
notify(get_string('databaseupgradegroups', '', $group_version), 'green'); notify(get_string('databaseupgradegroups', '', $group_version), 'green');
print_continue($continueto); print_continue($continueto);
print_footer();
exit; exit;
} else { } else {
error("Upgrade of group system failed! (Could not update version in config table)"); error("Upgrade of group system failed! (Could not update version in config table)");
@ -126,6 +127,7 @@ function upgrade_group_db($continueto) {
notify(get_string('databasesuccess'), 'green'); notify(get_string('databasesuccess'), 'green');
notify(get_string('databaseupgradegroups', '', $group_version), 'green'); notify(get_string('databaseupgradegroups', '', $group_version), 'green');
print_continue($continueto); print_continue($continueto);
print_footer();
exit; exit;
} else { } else {
error("Upgrade of group system failed! (Could not update version in config table)"); error("Upgrade of group system failed! (Could not update version in config table)");

View File

@ -169,6 +169,7 @@ function upgrade_plugins($type, $dir, $return) {
if ($updated_plugins) { if ($updated_plugins) {
print_continue($return); print_continue($return);
print_footer();
die; die;
} }
} }
@ -381,6 +382,7 @@ function upgrade_activity_modules($return) {
if ($updated_modules) { if ($updated_modules) {
print_continue($return); print_continue($return);
print_footer();
die; die;
} }
} }

View File

@ -1039,6 +1039,7 @@ function upgrade_blocks_db($continueto) {
notify(get_string('databasesuccess'), 'notifysuccess'); notify(get_string('databasesuccess'), 'notifysuccess');
notify(get_string('databaseupgradeblocks', '', $blocks_version), 'notifysuccess'); notify(get_string('databaseupgradeblocks', '', $blocks_version), 'notifysuccess');
print_continue($continueto); print_continue($continueto);
print_footer();
exit; exit;
} else { } else {
error('Upgrade of blocks system failed! (Could not update version in config table)'); error('Upgrade of blocks system failed! (Could not update version in config table)');
@ -1099,6 +1100,7 @@ function upgrade_blocks_db($continueto) {
notify(get_string('databasesuccess'), 'notifysuccess'); notify(get_string('databasesuccess'), 'notifysuccess');
notify(get_string('databaseupgradeblocks', '', $blocks_version), 'notifysuccess'); notify(get_string('databaseupgradeblocks', '', $blocks_version), 'notifysuccess');
print_continue($continueto); print_continue($continueto);
print_footer();
exit; exit;
} else { } else {
error('Upgrade of blocks system failed! (Could not update version in config table)'); error('Upgrade of blocks system failed! (Could not update version in config table)');
@ -1373,6 +1375,7 @@ function upgrade_blocks_plugins($continueto) {
if (!empty($updated_blocks)) { if (!empty($updated_blocks)) {
print_continue($continueto); print_continue($continueto);
print_footer();
die; die;
} }
} }

View File

@ -395,6 +395,8 @@
if (!isset($USER->newadminuser)) { if (!isset($USER->newadminuser)) {
print_footer($course); print_footer($course);
} else {
print_footer();
} }
exit; exit;