merged fixing a warning

moodle · Mar 20, 2007 · c0aa9f0 · c0aa9f0
1 parent 41a89a0
commit c0aa9f0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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();