Permalink
Browse files

print_footer('none') during install and upgrade to hide home link and…

… xhtml strict fixes
  • Loading branch information...
1 parent ca360e8 commit acdd790f7495b33525596ce2a8e35b824a419c24 skodak committed Jan 15, 2007
Showing with 14 additions and 10 deletions.
  1. +2 −0 admin/index.php
  2. +2 −1 backup/lib.php
  3. +2 −2 group/db/upgrade.php
  4. +4 −4 lib/adminlib.php
  5. +3 −3 lib/blocklib.php
  6. +1 −0 lib/locallib.php
View
@@ -190,6 +190,7 @@
error("Error: Main databases NOT set up successfully");
}
print_continue('index.php');
+ print_footer('none');
die;
}
@@ -287,6 +288,7 @@
remove_dir($CFG->dataroot . '/cache', true); // flush cache
notify($strdatabasesuccess, "green");
print_continue("upgradesettings.php");
+ print_footer('none');
exit;
} else {
notify("Upgrade failed! (Could not update version in config table)");
View
@@ -351,7 +351,7 @@ function upgrade_backup_db($continueto) {
notify(get_string("databasesuccess"), "green");
notify(get_string("databaseupgradebackups", "", $backup_version), "green");
print_continue($continueto);
- print_footer();
+ print_footer('none');
exit;
} else {
error("Upgrade of backup system failed! (Could not update version in config table)");
@@ -412,6 +412,7 @@ function upgrade_backup_db($continueto) {
notify(get_string("databasesuccess"), "green");
notify(get_string("databaseupgradebackups", "", $backup_version), "green");
print_continue($continueto);
+ print_footer('none');
exit;
} else {
error("Upgrade of backup system failed! (Could not update version in config table)");
View
@@ -69,7 +69,7 @@ function upgrade_group_db($continueto) {
notify(get_string('databasesuccess'), 'green');
notify(get_string('databaseupgradegroups', '', $group_version), 'green');
print_continue($continueto);
- print_footer();
+ print_footer('none');
exit;
} else {
error("Upgrade of group system failed! (Could not update version in config table)");
@@ -127,7 +127,7 @@ function upgrade_group_db($continueto) {
notify(get_string('databasesuccess'), 'green');
notify(get_string('databaseupgradegroups', '', $group_version), 'green');
print_continue($continueto);
- print_footer();
+ print_footer('none');
exit;
} else {
error("Upgrade of group system failed! (Could not update version in config table)");
View
@@ -57,6 +57,7 @@ function upgrade_plugins($type, $dir, $return) {
if (!empty($plugin->requires)) {
if ($plugin->requires > $CFG->version) {
+ $info = new object();
$info->pluginname = $plug;
$info->pluginversion = $plugin->version;
$info->currentmoodle = $CFG->version;
@@ -69,7 +70,6 @@ function upgrade_plugins($type, $dir, $return) {
upgrade_log_start();
notify(get_string('pluginrequirementsnotmet', 'error', $info));
$updated_plugins = true;
- unset($info);
continue;
}
}
@@ -169,7 +169,7 @@ function upgrade_plugins($type, $dir, $return) {
if ($updated_plugins) {
print_continue($return);
- print_footer();
+ print_footer('none');
die;
}
}
@@ -227,6 +227,7 @@ function upgrade_activity_modules($return) {
if (!empty($module->requires)) {
if ($module->requires > $CFG->version) {
+ $info = new object();
$info->modulename = $mod;
$info->moduleversion = $module->version;
$info->currentmoodle = $CFG->version;
@@ -239,7 +240,6 @@ function upgrade_activity_modules($return) {
upgrade_log_start();
notify(get_string('modulerequirementsnotmet', 'error', $info));
$updated_modules = true;
- unset($info);
continue;
}
}
@@ -382,7 +382,7 @@ function upgrade_activity_modules($return) {
if ($updated_modules) {
print_continue($return);
- print_footer();
+ print_footer('none');
die;
}
}
View
@@ -1039,7 +1039,7 @@ function upgrade_blocks_db($continueto) {
notify(get_string('databasesuccess'), 'notifysuccess');
notify(get_string('databaseupgradeblocks', '', $blocks_version), 'notifysuccess');
print_continue($continueto);
- print_footer();
+ print_footer('none');
exit;
} else {
error('Upgrade of blocks system failed! (Could not update version in config table)');
@@ -1100,7 +1100,7 @@ function upgrade_blocks_db($continueto) {
notify(get_string('databasesuccess'), 'notifysuccess');
notify(get_string('databaseupgradeblocks', '', $blocks_version), 'notifysuccess');
print_continue($continueto);
- print_footer();
+ print_footer('none');
exit;
} else {
error('Upgrade of blocks system failed! (Could not update version in config table)');
@@ -1375,7 +1375,7 @@ function upgrade_blocks_plugins($continueto) {
if (!empty($updated_blocks)) {
print_continue($continueto);
- print_footer();
+ print_footer('none');
die;
}
}
View
@@ -103,6 +103,7 @@ function upgrade_local_db($continueto) {
notify(get_string('databasesuccess'), 'notifysuccess');
notify(get_string('databaseupgradelocal', '', $local_version));
print_continue($continueto);
+ print_footer('none');
exit;
} else {
error('Upgrade of local database customisations failed! (Could not update version in config table)');

0 comments on commit acdd790

Please sign in to comment.