From dbf5aef1ff36e0921ee4d311c75662654dfd249d Mon Sep 17 00:00:00 2001
From: christianbeeznst <christian.fasanando@beeznest.com>
Date: Sat, 4 May 2024 15:18:16 -0500
Subject: [PATCH] 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 | 8 +++++---
 public/main/inc/lib/sessionmanager.lib.php      | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/main/gradebook/lib/be/category.class.php b/public/main/gradebook/lib/be/category.class.php
index 4646029b28..90f3ec3b57 100644
--- a/public/main/gradebook/lib/be/category.class.php
+++ b/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)) {
-            $sql .= $bond.' (session_id IS NULL OR session_id = 0) ';
-        } else {
+        if (!empty($session_id)) {
             $sql .= $bond.' session_id = '.$session_id;
+        } else {
+            if (empty($id)) {
+                $sql .= $bond.' (session_id IS NULL OR session_id = 0) ';
+            }
         }
         $bond = ' AND';
 
diff --git a/public/main/inc/lib/sessionmanager.lib.php b/public/main/inc/lib/sessionmanager.lib.php
index 2669cf2b8a..ad2671eae8 100644
--- a/public/main/inc/lib/sessionmanager.lib.php
+++ b/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)) {