From dcf9be7f56fea50edfae5e0fb16509e11f3d2ef4 Mon Sep 17 00:00:00 2001
From: Martin Dougiamas <martin@moodle.com>
Date: Mon, 31 May 2010 05:34:16 +0000
Subject: [PATCH] MDL-22622 Reset caches before and after the core upgrade.
 Seems to fix the problems we were having.

---
 lib/upgradelib.php | 5 +++++
 1 file changed, 5 insertions(+)

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