mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

accesslib - Remove some notices when user is not logged in

Browse Source
This commit is contained in:
Martin Dougiamas 2009-10-27 09:31:46 +00:00
parent 2cb1ee78e4
commit 7fde45a7e6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/accesslib.php
View File

@ -510,7 +510,7 @@ function has_capability($capability, $context, $userid=NULL, $doanything=true) {
} }
$USER->access = $ACCESSLIB_PRIVATE->accessdatabyuser[$userid]; $USER->access = $ACCESSLIB_PRIVATE->accessdatabyuser[$userid];
} else if ($USER->id == $userid && !isset($USER->access)) { } else if (isset($USER->id) && ($USER->id == $userid) && !isset($USER->access)) {
// caps not loaded yet - better to load them to keep BC with 1.8 // caps not loaded yet - better to load them to keep BC with 1.8
// not-logged-in user or $USER object set up manually first time here // not-logged-in user or $USER object set up manually first time here
load_all_capabilities(); load_all_capabilities();
@ -549,7 +549,7 @@ function has_capability($capability, $context, $userid=NULL, $doanything=true) {
// divulge how many times we are called // divulge how many times we are called
//// error_log("has_capability: id:{$context->id} path:{$context->path} userid:$userid cap:$capability"); //// error_log("has_capability: id:{$context->id} path:{$context->path} userid:$userid cap:$capability");
if ($USER->id == $userid) { // we must accept strings and integers in $userid if (isset($USER->id) && ($USER->id == $userid)) { // we must accept strings and integers in $userid
// //
// For the logged in user, we have $USER->access // For the logged in user, we have $USER->access
// which will have all RAs and caps preloaded for // which will have all RAs and caps preloaded for