merged fixing a warning

diff --git a/lib/accesslib.php b/lib/accesslib.php
index a091f0889d20be424da70269daa56eceab47d06e..8bd7b59781071c064e2e3a727d47e86220dd8a79 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -1155,7 +1155,11 @@ function load_all_capabilities() {
             }
         }
 
-        $USER->capabilities = merge_role_caps($USER->capabilities, $defcaps);
+        if (isset($USER->capabilities)) {
+            $USER->capabilities = merge_role_caps($USER->capabilities, $defcaps);
+        } else {
+            $USER->capabilities = $defcaps;
+        }
 
     } else {
         load_notloggedin_role();