Fix query, restore use of groupIid see BT#12609

main/inc/lib/groupmanager.lib.php

@@ -1038,7 +1038,7 @@ class GroupManager
         $sql = "$select
                 FROM $group_user_table gu
                 INNER JOIN $groupTable g
-                ON (gu.group_id = g.iid and g.c_id = gu.c_id)
+                ON (gu.group_id = g.id and g.c_id = gu.c_id)
                 INNER JOIN $user_table u
                 ON (u.id = gu.user_id)
                 WHERE 
@@ -1056,7 +1056,6 @@ class GroupManager
             $limit = intval($limit);
             $sql .= " LIMIT $start, $limit";
         }
-
         $res = Database::query($sql);
         $users = array();
         while ($obj = Database::fetch_object($res)) {
@@ -1461,7 +1460,7 @@ class GroupManager
     public static function is_subscribed($user_id, $groupInfo)
     {
         $course_id = api_get_course_int_id();
-        if (empty($user_id) || empty($group_id) || empty($course_id)) {
+        if (empty($user_id) || empty($groupInfo) || empty($course_id)) {
             return false;
         }
         $table_group_user = Database::get_course_table(TABLE_GROUP_USER);

main/work/work.lib.php

@@ -476,7 +476,12 @@ function getUniqueStudentAttempts(
         $groupIid = $groupInfo['iid'];
     }
 
-    $sessionCondition = api_get_session_condition($sessionId, true, false, 'w.session_id');
+    $sessionCondition = api_get_session_condition(
+        $sessionId,
+        true,
+        false,
+        'w.session_id'
+    );
 
     $sql = "SELECT count(*) FROM (
                 SELECT count(*), w.parent_id
@@ -1276,7 +1281,12 @@ function get_count_work($work_id, $onlyMeUserId = null, $notMeUserId = null)
 
     $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
     $session_id = api_get_session_id();
-    $condition_session = api_get_session_condition($session_id, true, false, 'work.session_id');
+    $condition_session = api_get_session_condition(
+        $session_id,
+        true,
+        false,
+        'work.session_id'
+    );
 
     $group_id = api_get_group_id();
     $course_info = api_get_course_info();
@@ -1289,7 +1299,6 @@ function get_count_work($work_id, $onlyMeUserId = null, $notMeUserId = null)
         $groupIid = $groupInfo['iid'];
     }
 
-
     if (!empty($group_id)) {
         // set to select only messages posted by the user's group
         $extra_conditions = " work.post_group_id = '".intval($groupIid)."' ";
@@ -1565,7 +1574,7 @@ function getWorkListTeacher(
                     $condition_session AND
                     $active_condition AND
                     parent_id = 0 AND
-                    post_group_id = $group_id
+                    post_group_id = $groupIid
                     $where_condition
                 ORDER BY $column $direction
                 LIMIT $start, $limit";
@@ -1944,7 +1953,7 @@ function get_work_user_list(
 
     if (!empty($work_data)) {
         if (!empty($group_id)) {
-            $extra_conditions = " work.post_group_id = '".intval($group_id)."' ";
+            $extra_conditions = " work.post_group_id = '".intval($groupIid)."' ";
             // set to select only messages posted by the user's group
         } else {
             $extra_conditions = " (work.post_group_id = '0' OR work.post_group_id is NULL) ";