Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: ywarnier

public/main/inc/lib/sessionmanager.lib.php

@@ -2893,7 +2893,7 @@ public static function add_courses_to_session(
 
                 // Subscribe all the users from the session to this course inside the session
                 self::insertUsersInCourse(
-                    array_column($user_list, 'id'),
+                    array_column($user_list, 'user_id'),
                     $courseId,
                     $sessionId,
                     ['visibility' => $sessionVisibility],
@@ -9840,6 +9840,9 @@ public static function insertUsersInCourses(array $studentIds, array $courseIds,
         }
     }
 
+    /**
+     * @throws \Doctrine\ORM\Exception\ORMException
+     */
     public static function insertUsersInCourse(
         array $studentIds,
         int $courseId,
@@ -9856,25 +9859,17 @@ public static function insertUsersInCourse(
 
         foreach ($studentIds as $studentId) {
             $user = api_get_user_entity($studentId);
+            $session->addUserInCourse($relationInfo['status'], $user, $course)
+                ->setVisibility($relationInfo['visibility']);
 
-            if (!$session->hasUserInCourse($user, $course)) {
-                $session->addUserInCourse($relationInfo['status'], $user, $course)
-                    ->setVisibility($relationInfo['visibility']);
-
-                Event::logUserSubscribedInCourseSession($user, $course, $session);
-            }
-
-            $subscription = new SessionRelUser();
-            $subscription->setUser($user);
-            $subscription->setSession($session);
-            $subscription->setRelationType(Session::STUDENT);
+            Event::logUserSubscribedInCourseSession($user, $course, $session);
 
-            if ($updateSession && !$session->hasUser($subscription)) {
+            if ($updateSession) {
                 $session->addUserInSession(Session::STUDENT, $user);
             }
         }
 
-        try {
+       try {
             $em->persist($session);
             $em->flush();
         } catch (\Exception $e) {