Merged fixes from stable for MDL-7229 (opentogoogle capabilities)

diff --git a/lib/setup.php b/lib/setup.php
index ed9fdca17b54e6604a549baf76bd23235203ed50..c5347e92095597e473998549908df001cf58030d 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -579,6 +579,9 @@ $CFG->os = PHP_OS;
                     $USER = guest_user();
                 }
             }
+            if (!empty($USER)) {
+                load_all_capabilities();
+            }
         }
     }