accesslib upgrade: admin/upgradesettings may need to load_all_capabilities()

This shouldn't happen, but sometimes admin/upgradesettings needs to
reload_all_capabilities(). So do it.

diff --git a/admin/upgradesettings.php b/admin/upgradesettings.php
index 1c801e26a726885ab4dfadc4b0832b34b247e674..d6fa482908ab9cab09aa7eb131d7406034eacf57 100644 (file)
--- a/admin/upgradesettings.php
+++ b/admin/upgradesettings.php
@@ -6,6 +6,12 @@
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 
+// Technically, we shouldn't need it, but during the
+// v1.9 accesslib upgrade _sometimes_ USER->access
+// isn't set.
+if (!isset($USER->access)) {
+    load_all_capabilities();
+}
 admin_externalpage_setup('upgradesettings'); // now hidden page
 
 // a caveat: we're depending on only having one admin access this page at once. why? the following line