Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19

Author: jmontoyaa

main/inc/lib/course.lib.php

@@ -1286,6 +1286,9 @@ public static function get_user_list_from_course_code(
 
         if (!empty($session_id)) {
             $sql = 'SELECT DISTINCT user.user_id, session_course_user.status as status_session, user.*  ';
+            if ($return_count) {
+                $sql = " SELECT COUNT(user.user_id) as count";
+            }
             $sql .= ' FROM '.Database::get_main_table(TABLE_MAIN_USER).' as user ';
             $sql .= ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).' as session_course_user
                       ON user.user_id = session_course_user.id_user
@@ -1393,11 +1396,11 @@ public static function get_user_list_from_course_code(
         $table_user_field_value = Database::get_main_table(TABLE_MAIN_USER_FIELD_VALUES);
         if ($count_rows) {
             while ($user = Database::fetch_array($rs)) {
-                $report_info = array();
-
                 if ($return_count) {
                     return $user['count'];
                 }
+                $report_info = array();
+
                 $user_info = $user;
                 $user_info['status'] = $user['status'];
 

main/work/work.lib.php

@@ -2834,7 +2834,7 @@ function getStudentSubscribedToWork($workId, $courseId, $groupId = null, $sessio
             $sessionId,
             null,
             null,
-            STUDENT,
+            null,
             $getCount
         );
     } else {