moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 's11_MDL-27976_undefined_variable_master' of github.com:dongsheng/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2011-07-01 13:43:05 +02:00
commit 264d81eee3
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
user/lib.php
View file

@ -114,10 +114,11 @@ function user_get_user_details($user, $course = null) {
if (!empty($course)) { if (!empty($course)) {
$context = get_context_instance(CONTEXT_COURSE, $course->id); $context = get_context_instance(CONTEXT_COURSE, $course->id);
$usercontext = get_context_instance(CONTEXT_USER, $user->id); $usercontext = get_context_instance(CONTEXT_USER, $user->id);
$canviewdetailscap = has_capability('moodle/user:viewdetails', $usercontext); $canviewdetailscap = (has_capability('moodle/user:viewdetails', $context) || has_capability('moodle/user:viewdetails', $usercontext));
} else { } else {
$context = get_context_instance(CONTEXT_USER, $user->id); $context = get_context_instance(CONTEXT_USER, $user->id);
$usercontext = $context; $usercontext = $context;
$canviewdetailscap = has_capability('moodle/user:viewdetails', $usercontext);
} }
$currentuser = ($user->id == $USER->id); $currentuser = ($user->id == $USER->id);
@ -128,7 +129,6 @@ function user_get_user_details($user, $course = null) {
} else { } else {
$canviewhiddenuserfields = has_capability('moodle/user:viewhiddendetails', $context); $canviewhiddenuserfields = has_capability('moodle/user:viewhiddendetails', $context);
} }
$canviewdetailscap = ($canviewdetailscap || has_capability('moodle/user:viewdetails', $context));
$canviewfullnames = has_capability('moodle/site:viewfullnames', $context); $canviewfullnames = has_capability('moodle/site:viewfullnames', $context);
if (!empty($course)) { if (!empty($course)) {
$canviewuseremail = has_capability('moodle/course:useremail', $context); $canviewuseremail = has_capability('moodle/course:useremail', $context);