Fixing query see BT#7754

main/work/work.lib.php

@@ -299,7 +299,6 @@ function getWorkList($id, $my_folder_data, $add_in_where_query = null)
 
     if ($linkInfo) {
         $workInGradeBookLinkId = $linkInfo['id'];
-
         if ($workInGradeBookLinkId) {
             if ($is_allowed_to_edit) {
                 if (intval($my_folder_data['qualification']) == 0) {
@@ -321,11 +320,9 @@ function getWorkList($id, $my_folder_data, $add_in_where_query = null)
                     $condition_session AND
                     $active_condition AND
                     (parent_id = 0)
-                  $contains_file_query ";
-        if (!empty($group_id)) {
-            $sql .= " AND post_group_id = '".$group_id."' ";
-        }
-        $sql .= " ORDER BY sent_date DESC";
+                    $contains_file_query AND
+                    post_group_id = '".$group_id."'
+                ORDER BY sent_date DESC";
     } else {
         if (!empty($group_id)) {
             // set to select only messages posted by the user's group
@@ -1660,15 +1657,15 @@ function getWorkListTeacher($start, $limit, $column, $direction, $where_conditio
         $sql = " $select
                 FROM $workTable w
                 LEFT JOIN $workTableAssignment a ON (a.publication_id = w.id AND a.c_id = w.c_id)
-                WHERE w.c_id = $course_id
+                WHERE
+                    w.c_id = $course_id
                     $condition_session AND
                     $active_condition AND
-                    (parent_id = 0) $where_condition ";
-
-        $sql .= " AND post_group_id = '".$group_id."' ";
-
-        $sql .= " ORDER BY $column $direction ";
-        $sql .= " LIMIT $start, $limit";
+                    (parent_id = 0)
+                    $where_condition AND
+                    post_group_id = '".$group_id."'
+                ORDER BY $column $direction
+                LIMIT $start, $limit";
 
         $result = Database::query($sql);