Function name change ... hope it doesn't break any third-party code,

sorry if it does!

  get_users_in_group --->  get_group_users

  ... more consistent with other functions

diff --git a/course/group.php b/course/group.php
index e7a961c533f0be7b5731508dd2b6a9a3724d3ac6..0debfe12de5bfc157a25104e212887fcfc98967c 100644 (file)
--- a/course/group.php
+++ b/course/group.php
@@ -114,7 +114,7 @@
 
     echo '<br />';
 
-    if ($users = get_users_in_group($group->id)) {
+    if ($users = get_group_users($group->id)) {
         foreach ($users as $user) {
             print_user($user, $course);
         }

diff --git a/course/groups.php b/course/groups.php
index a5185e134dba1159d66b25c7d6c695c1d7872820..8102067548cc36b0312b8425230d0e9a125e00dd 100644 (file)
--- a/course/groups.php
+++ b/course/groups.php
@@ -60,7 +60,7 @@
                 $t = $group;
                 $t->description = format_text($group->description);
                 $t->picture = print_group_picture($group, $course->id, true, true, true);
-                if ($t->users = get_users_in_group($group->id, 'u.lastname ASC')) {
+                if ($t->users = get_group_users($group->id, 'u.lastname ASC')) {
                     foreach ($t->users as $key => $user) {
                         $t->users[$key]->fullname = fullname($user, $isteacher);
                     }
@@ -198,7 +198,7 @@
         foreach ($groups as $group) {
             $countusers = 0;
             $listmembers[$group->id] = array();
-            if ($groupusers = get_users_in_group($group->id)) {
+            if ($groupusers = get_group_users($group->id)) {
                 foreach ($groupusers as $groupuser) {
                     $listmembers[$group->id][$groupuser->id] = $nonmembers[$groupuser->id];
                     unset($nonmembers[$groupuser->id]);

diff --git a/mod/assignment/submissions.php b/mod/assignment/submissions.php
index 4974ad4d815afd424339195ff11a302af10e5094..24a3bdeb76d370a393b5e1d31b45e40d53b86be9 100644 (file)
--- a/mod/assignment/submissions.php
+++ b/mod/assignment/submissions.php
@@ -51,7 +51,7 @@
     $teachers = get_course_teachers($course->id);
 
     if ($currentgroup) {
-        $users = get_users_in_group($currentgroup);
+        $users = get_group_users($currentgroup);
     } else {
         $users = get_course_students($course->id);
     }

diff --git a/mod/choice/report.php b/mod/choice/report.php
index 9c89c715d73fe29b20676621edfc3797c9d7d876..f2aad9ea4193e30a356ce571cd81109926d1a6ac 100644 (file)
--- a/mod/choice/report.php
+++ b/mod/choice/report.php
@@ -42,7 +42,7 @@
     }
 
     if ($currentgroup) {
-        $users = get_users_in_group($currentgroup, "u.firstname ASC");
+        $users = get_group_users($currentgroup, "u.firstname ASC");
     } else {
         $users = get_course_users($course->id, "u.firstname ASC");
     }

diff --git a/mod/choice/view.php b/mod/choice/view.php
index d854cb9aa4fa3fbf232e2e8db0eaa18c7d4e3471..f03159366c24b2975f1f7c0ea8942e6eb79250d0 100644 (file)
--- a/mod/choice/view.php
+++ b/mod/choice/view.php
@@ -115,7 +115,7 @@
         print_heading(get_string("responses", "choice"));
 
         if ($currentgroup) {
-            $users = get_users_in_group($currentgroup, "u.firstname ASC");
+            $users = get_group_users($currentgroup, "u.firstname ASC");
         } else {
             $users = get_course_users($course->id, "u.firstname ASC");
         }

diff --git a/mod/journal/report.php b/mod/journal/report.php
index 8fd3030efc11153a15c019ab15cddfd1b8121db0..064339a82cd3c0040a377d8caecc7638bf34e2bb 100644 (file)
--- a/mod/journal/report.php
+++ b/mod/journal/report.php
@@ -98,7 +98,7 @@
 /// Print out the journal entries
 
     if ($currentgroup) {
-        $users = get_users_in_group($currentgroup);
+        $users = get_group_users($currentgroup);
     } else {
         $users = get_course_students($course->id);
     }

diff --git a/mod/survey/download.php b/mod/survey/download.php
index 854c49a8e76ecd0f1b68cbefa50dd044ec079405..b4a7dd1bcd8f60d0f3a14831aaf3f2558ef490ef 100644 (file)
--- a/mod/survey/download.php
+++ b/mod/survey/download.php
@@ -33,7 +33,7 @@
     $groupmode = groupmode($course, $cm);   // Groups are being used
 
     if ($groupmode and $group) {
-        $users = get_users_in_group($group);
+        $users = get_group_users($group);
     } else {
         $users = get_course_users($course->id);
         $group = false;

diff --git a/mod/survey/graph.php b/mod/survey/graph.php
index 9bbd5b214c5076839565e826a4d548a628d24cb9..7c3716772666e0d2d3e44a8580a94ee69825caf3 100644 (file)
--- a/mod/survey/graph.php
+++ b/mod/survey/graph.php
@@ -35,7 +35,7 @@
 
 /// Check to see if groups are being used in this survey
     if ($groupmode and $group) {
-        $users = get_users_in_group($group);
+        $users = get_group_users($group);
     } else {
         $users = get_course_users($course->id);
         $group = false;

diff --git a/mod/survey/report.php b/mod/survey/report.php
index 0420f6e23d8c7bf05d27b98e15f1a818129a88c9..b183d80e0dedd14f1f8f58dd104834dde660b67d 100644 (file)
--- a/mod/survey/report.php
+++ b/mod/survey/report.php
@@ -73,7 +73,7 @@
     }
 
     if ($currentgroup) {
-        $users = get_users_in_group($currentgroup);
+        $users = get_group_users($currentgroup);
     } else {
         $users = get_course_users($course->id);
     }