From a12f686b629e2b31fa44082c1d024d145105885d Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Sat, 13 Mar 2004 14:24:34 +0000
Subject: [PATCH] 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
---
 course/group.php               | 2 +-
 course/groups.php              | 4 ++--
 mod/assignment/submissions.php | 2 +-
 mod/choice/report.php          | 2 +-
 mod/choice/view.php            | 2 +-
 mod/journal/report.php         | 2 +-
 mod/survey/download.php        | 2 +-
 mod/survey/graph.php           | 2 +-
 mod/survey/report.php          | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/course/group.php b/course/group.php
index e7a961c533f..0debfe12de5 100644
--- 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 a5185e134db..8102067548c 100644
--- 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 4974ad4d815..24a3bdeb76d 100644
--- 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 9c89c715d73..f2aad9ea419 100644
--- 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 d854cb9aa4f..f03159366c2 100644
--- 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 8fd3030efc1..064339a82cd 100644
--- 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 854c49a8e76..b4a7dd1bcd8 100644
--- 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 9bbd5b214c5..7c371677266 100644
--- 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 0420f6e23d8..b183d80e0de 100644
--- 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);
     }