Skip to content
Browse files

Merge branch 'w29_MDL-27653_m21_usercasting' of git://github.com/skod…

…ak/moodle into MOODLE_21_STABLE
  • Loading branch information...
2 parents ae53757 + 13d0cc4 commit dbb6d73c8c3eee9599ecf96ecd996ceadbfd5f10 Sam Hemelryk committed Jul 25, 2011
Showing with 8 additions and 8 deletions.
  1. +8 −8 lib/accesslib.php
View
16 lib/accesslib.php
@@ -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)) {
@@ -4518,9 +4518,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)) {

0 comments on commit dbb6d73

Please sign in to comment.
Something went wrong with that request. Please try again.