L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
parent 67fcc9989a 1e539f647d
commit 264d81eee3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/lib.php
+2 -2
View File
@@ -114,10 +114,11 @@ function user_get_user_details($user, $course = null) {
if (!empty($course)) {
$context = get_context_instance(CONTEXT_COURSE, $course->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 {
$context = get_context_instance(CONTEXT_USER, $user->id);
$usercontext = $context;
$canviewdetailscap = has_capability('moodle/user:viewdetails', $usercontext);
}
$currentuser = ($user->id == $USER->id);
@@ -128,7 +129,6 @@ function user_get_user_details($user, $course = null) {
} else {
$canviewhiddenuserfields = has_capability('moodle/user:viewhiddendetails', $context);
}
$canviewdetailscap = ($canviewdetailscap || has_capability('moodle/user:viewdetails', $context));
$canviewfullnames = has_capability('moodle/site:viewfullnames', $context);
if (!empty($course)) {
$canviewuseremail = has_capability('moodle/course:useremail', $context);