Internal: Fix gradebook evaluation duplication to copy in session, not in the base course - refs BT#21541

public/main/gradebook/lib/be/category.class.php

@@ -467,10 +467,12 @@ class Category implements GradebookItem
             $session_id = api_get_session_id();
         }
 
-        if (empty($session_id)) {
+        if (!empty($session_id)) {
-            $sql .= $bond.' (session_id IS NULL OR session_id = 0) ';
-        } else {
             $sql .= $bond.' session_id = '.$session_id;
+        } else {
+            if (empty($id)) {
+                $sql .= $bond.' (session_id IS NULL OR session_id = 0) ';
+            }
         }
         $bond = ' AND';
 

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

@@ -2793,7 +2793,7 @@ class SessionManager
                                 null,
                                 false,
                                 $courseId,
-                                0
+                                $sessionId
                             );
 
                             //$cat->set_session_id($sessionId);
@@ -2821,7 +2821,7 @@ class SessionManager
                                 null,
                                 false,
                                 $courseId,
-                                0
+                                $sessionId
                             );
 
                             if (!empty($evaluationList)) {