Merge branch '44279-27' of git://github.com/samhemelryk/moodle

moodle · Feb 24, 2014 · e848a93 · e848a93
2 parents e3eaf61 + 854859e
commit e848a93
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/user/lib.php b/user/lib.php
@@ -540,7 +540,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);
             }
         }

diff --git a/user/tests/externallib_test.php b/user/tests/externallib_test.php
@@ -341,6 +341,16 @@ public function test_get_users_by_field() {
 
         // 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));
     }
 
     /**