Index: group/members.php
===================================================================
RCS file: /cvsroot/moodle/moodle/group/members.php,v
retrieving revision 1.3.2.4
diff -u -r1.3.2.4 members.php
--- group/members.php	19 Mar 2008 10:46:32 -0000	1.3.2.4
+++ group/members.php	8 Apr 2008 09:40:55 -0000
@@ -152,33 +152,40 @@
 $navigation = build_navigation($navlinks);
 
 print_header("$course->shortname: $strgroups", $course->fullname, $navigation, '', '', true, '', user_login_string($course, $USER));
-
 // Print Javascript for showing the selected users group membership
 ?>
 <script type="text/javascript">
 //<![CDATA[
 var userSummaries = Array(
 <?php
-$membercnt = count($nonmembers);
-$i=1;
-foreach ($nonmembers as $userid => $potentalmember) {
-
-    if (isset($usergroups[$userid])) {
-        $usergrouplist = '<ul>';
+$first=true;
+// Because this loop runs in the same order as the identical loop above,
+// each element in this JS array corresponds to the Nth option in the <select>. 
+foreach($potentialmembersbyrole as $roledata) {
+    foreach($roledata->users as $potentialmember) {
+        $userid=$potentialmember->id;
+
+        // Build list of groups for this user
+        if (isset($usergroups[$userid])) {
+            $usergrouplist = '<ul>';
 
-        foreach ($usergroups[$userid] as $groupitem) {
-            $usergrouplist .= '<li>'.addslashes(format_string($groupitem->name)).'</li>';
+            foreach ($usergroups[$userid] as $groupitem) {
+                $usergrouplist .= '<li>'.addslashes(format_string($groupitem->name)).'</li>';
+            }
+            $usergrouplist .= '</ul>';
         }
-        $usergrouplist .= '</ul>';
-    }
-    else {
-    	$usergrouplist = '';
-    }
-    echo "'$usergrouplist'";
-    if ($i < $membercnt) {
-    	echo ', ';
+        else {
+        	$usergrouplist = '';
+        }
+        // Put a comma between items
+        if($first) {
+            $first=false;
+        } else {
+            echo ', ';
+        }
+        // HTML for displaying group membership
+        echo "'$usergrouplist'";
     }
-    $i++;
 }
 ?>
 );