MDL-22622 Reset caches before and after the core upgrade. Seems to fix the problems we were having.

This commit is contained in:
Martin Dougiamas 2010-05-31 05:34:16 +00:00
parent cebb75a808
commit dcf9be7f56

View file

@ -1216,6 +1216,10 @@ function upgrade_core($version, $verbose) {
require_once($CFG->libdir.'/db/upgrade.php'); // Defines upgrades require_once($CFG->libdir.'/db/upgrade.php'); // Defines upgrades
try { try {
// Reset caches before any output
upgrade_reset_caches();
remove_dir($CFG->dataroot . '/cache', true); // flush cache
// Upgrade current language pack if we can // Upgrade current language pack if we can
if (empty($CFG->skiplangupgrade)) { if (empty($CFG->skiplangupgrade)) {
upgrade_language_pack(false); upgrade_language_pack(false);
@ -1246,6 +1250,7 @@ function upgrade_core($version, $verbose) {
events_update_definition('moodle'); events_update_definition('moodle');
message_update_providers('moodle'); message_update_providers('moodle');
// Reset caches again, just to be sure
upgrade_reset_caches(); upgrade_reset_caches();
remove_dir($CFG->dataroot . '/cache', true); // flush cache remove_dir($CFG->dataroot . '/cache', true); // flush cache