merged fixing a warning

2007-03-20 02:57:57 +00:00
parent 41a89a0748
commit c0aa9f0956
1 changed files with 5 additions and 1 deletions
@@ -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();