From: toyomoyo <toyomoyo>
Date: Tue, 20 Mar 2007 02:57:57 +0000 (+0000)
Subject: merged fixing a warning
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c0aa9f09561c91b81d6d7ba00ab976c42b5be4ff;p=moodle.git

merged fixing a warning
---

diff --git a/lib/accesslib.php b/lib/accesslib.php
index a091f0889d..8bd7b59781 100755
--- 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();