From ad16262bc5811d4793dd282cf90b59016c98d9da Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Thu, 20 Feb 2014 09:53:36 +1300 Subject: [PATCH 1/2] MDL-44279 user: added unit test to trigger known bug --- user/tests/externallib_test.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/user/tests/externallib_test.php b/user/tests/externallib_test.php index 42f080ba543..43a6c832583 100644 --- a/user/tests/externallib_test.php +++ b/user/tests/externallib_test.php @@ -340,6 +340,16 @@ class core_user_external_testcase extends externallib_advanced_testcase { // Only the own $USER username should be returned $this->assertEquals(1, count($returnedusers)); + + // And finally test as one of the enrolled users. + $this->setUser($user1); + + // Call the external function. + $returnedusers = core_user_external::get_users_by_field('username', + array($USER->username, $user1->username, $user2->username)); + + // Only the own $USER username should be returned still. + $this->assertEquals(1, count($returnedusers)); } /** From 987a9359acd1dde5655592921a380524370ba5af Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Thu, 20 Feb 2014 09:43:22 +1300 Subject: [PATCH 2/2] MDL-42279 user: fixed typo in user_get_user_details_courses --- user/lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/lib.php b/user/lib.php index 560e3112580..02dd4a7c6a2 100644 --- a/user/lib.php +++ b/user/lib.php @@ -509,7 +509,7 @@ function user_get_user_details_courses($user) { } else { // Try through course profile. foreach ($courses as $course) { - if ($can_view_user_details_cap($user, $course) || ($user->id == $USER->id) || has_coursecontact_role($user->id)) { + if (can_view_user_details_cap($user, $course) || ($user->id == $USER->id) || has_coursecontact_role($user->id)) { $userdetails = user_get_user_details($user, $course); } }