MDL-19776 make sure contexts are fully initialised after each core upgrade, it is...

[moodle.git] / lib / upgradelib.php

diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index fa917e8..a36f3c9 100644 (file)
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -1259,6 +1259,11 @@ function upgrade_core($version, $verbose) {
         // Reset caches again, just to be sure
         upgrade_reset_caches();
         remove_dir($CFG->dataroot . '/cache', true); // flush cache
+
+        // Clean up contexts - more and more stuff depends on existence of paths and contexts
+        cleanup_contexts();
+        create_contexts();
+        build_context_path();
         $syscontext = get_context_instance(CONTEXT_SYSTEM);
         mark_context_dirty($syscontext->path);