mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 08:55:15 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'w29_MDL-27653_m22_usercasting' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2011-07-25 10:59:08 +08:00
commit 7fe0effd00
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/accesslib.php
View File

@ -569,9 +569,9 @@ function has_capability($capability, $context, $user = null, $doanything = true)
// make sure there is a real user specified
if ($user === null) {
$userid = !empty($USER->id) ? $USER->id : 0;
$userid = isset($USER->id) ? $USER->id : 0;
} else {
$userid = !empty($user->id) ? $user->id : $user;
$userid = is_object($user) ? $user->id : $user;
}
// capability must exist
@ -2841,9 +2841,9 @@ function is_guest($context, $user = null) {
// make sure there is a real user specified
if ($user === null) {
$userid = !empty($USER->id) ? $USER->id : 0;
$userid = isset($USER->id) ? $USER->id : 0;
} else {
$userid = !empty($user->id) ? $user->id : $user;
$userid = is_object($user) ? $user->id : $user;
}
if (isguestuser($userid)) {
@ -2914,9 +2914,9 @@ function is_enrolled($context, $user = null, $withcapability = '', $onlyactive =
// make sure there is a real user specified
if ($user === null) {
$userid = !empty($USER->id) ? $USER->id : 0;
$userid = isset($USER->id) ? $USER->id : 0;
} else {
$userid = !empty($user->id) ? $user->id : $user;
$userid = is_object($user) ? $user->id : $user;
}
if (empty($userid)) {
@ -4524,9 +4524,9 @@ function get_assignable_roles($context, $rolenamedisplay = ROLENAME_ALIAS, $with
// make sure there is a real user specified
if ($user === null) {
$userid = !empty($USER->id) ? $USER->id : 0;
$userid = isset($USER->id) ? $USER->id : 0;
} else {
$userid = !empty($user->id) ? $user->id : $user;
$userid = is_object($user) ? $user->id : $user;
}
if (!has_capability('moodle/role:assign', $context, $userid)) {