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

Merge branch 'MDL-58032-master' of git://github.com/ankitagarwal/moodle

Browse source
This commit is contained in:
Andrew Nicols 2017-02-27 11:45:30 +08:00
commit 50d567767c
2 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
user/lib.php
View file

@ -1142,6 +1142,11 @@ function user_can_view_profile($user, $course = null, $usercontext = null) {
} else {
$sharedcourses = enrol_get_shared_courses($USER->id, $user->id, true);
}
if (empty($sharedcourses)) {
return false;
}
foreach ($sharedcourses as $sharedcourse) {
$coursecontext = context_course::instance($sharedcourse->id);
if (has_capability('moodle/user:viewdetails', $coursecontext)) {

20
user/tests/userlib_test.php
View file

@ -502,6 +502,8 @@ class core_userliblib_testcase extends advanced_testcase {
$user5 = $this->getDataGenerator()->create_user();
$user6 = $this->getDataGenerator()->create_user(array('deleted' => 1));
$user7 = $this->getDataGenerator()->create_user();
$user8 = $this->getDataGenerator()->create_user();
$user8->id = 0; // Visitor.
$studentrole = $DB->get_record('role', array('shortname' => 'student'));
// Add the course creator role to the course contact and assign a user to that role.
@ -575,6 +577,24 @@ class core_userliblib_testcase extends advanced_testcase {
$this->assertTrue(user_can_view_profile($user4));
$CFG->coursecontact = null;
// Visitor (Not a guest user, userid=0).
$CFG->forceloginforprofiles = 1;
$this->setUser($user8);
// By default guest has 'moodle/user:viewdetails' cap.
$this->assertTrue(user_can_view_profile($user1));
$CFG->forceloginforprofiles = 0;
$this->assertTrue(user_can_view_profile($user1));
// Let us remove this cap.
$allroles = $DB->get_records_menu('role', array(), 'id', 'archetype, id');
assign_capability('moodle/user:viewdetails', CAP_PROHIBIT, $allroles['guest'], context_system::instance()->id, true);
reload_all_capabilities();
$CFG->forceloginforprofiles = 1;
$this->assertFalse(user_can_view_profile($user1));
$CFG->forceloginforprofiles = 0;
$this->assertTrue(user_can_view_profile($user1));
}
/**