Merge remote-tracking branch 'origin/release_8' into release_8

ILIAS-eLearning · Sep 19, 2024 · 1a858bc · 1a858bc
2 parents d3e02a7 + d10900d
commit 1a858bc
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/Modules/CategoryReference/classes/class.ilObjCategoryReferenceListGUI.php b/Modules/CategoryReference/classes/class.ilObjCategoryReferenceListGUI.php
@@ -111,7 +111,7 @@ public function initItem(
         $target_title = ilContainerReference::_lookupTitle($obj_id);
         $target_description = ilObject::_lookupDescription($target_obj_id);
 
-        $this->deleted = $tree->isDeleted($target_ref_id);
+        $this->deleted = !$target_ref_id || $tree->isDeleted($target_ref_id);
 
         parent::initItem($target_ref_id, $target_obj_id, $type, $target_title, $target_description);
 

diff --git a/Modules/CourseReference/classes/class.ilObjCourseReferenceListGUI.php b/Modules/CourseReference/classes/class.ilObjCourseReferenceListGUI.php
@@ -128,7 +128,7 @@ public function initItem(
         $target_title = ilContainerReference::_lookupTitle($obj_id);
         $target_description = ilObject::_lookupDescription($target_obj_id);
 
-        $this->deleted = $tree->isDeleted($target_ref_id);
+        $this->deleted = !$target_ref_id || $tree->isDeleted($target_ref_id);
 
         $ilBench->start("ilObjCourseListGUI", "1000_checkAllConditions");
         $this->conditions_ok = ilConditionHandler::_checkAllConditionsOfTarget($target_ref_id, $target_obj_id);

diff --git a/Modules/GroupReference/classes/class.ilObjGroupReferenceListGUI.php b/Modules/GroupReference/classes/class.ilObjGroupReferenceListGUI.php
@@ -117,7 +117,7 @@ public function initItem(
         $target_title = ilContainerReference::_lookupTitle($obj_id);
         $target_description = ilObject::_lookupDescription($target_obj_id);
 
-        $this->deleted = $tree->isDeleted($target_ref_id);
+        $this->deleted = !$target_ref_id || $tree->isDeleted($target_ref_id);
 
         $this->conditions_ok = ilConditionHandler::_checkAllConditionsOfTarget($target_ref_id, $target_obj_id);
 

diff --git a/Services/MediaObjects/classes/class.ilObjMediaObjectAccess.php b/Services/MediaObjects/classes/class.ilObjMediaObjectAccess.php
@@ -25,6 +25,7 @@ class ilObjMediaObjectAccess implements ilWACCheckingClass
     protected ilObjectDataCache $obj_data_cache;
     protected ilObjUser $user;
     protected ilAccessHandler $access;
+    protected ilLogger $logger;
 
     public function __construct()
     {
@@ -33,6 +34,7 @@ public function __construct()
         $this->obj_data_cache = $DIC["ilObjDataCache"];
         $this->user = $DIC->user();
         $this->access = $DIC->access();
+        $this->logger = $DIC->logger()->mob();
     }
 
     public function canBeDelivered(ilWACPath $ilWACPath): bool
@@ -69,11 +71,20 @@ protected function checkAccessMob(
                         return true;
                     }
                     break;
-
+                
                 default:
-                    if ($this->checkAccessMobUsage($usage, $oid)) {
+                    if ($oid !== null && $this->checkAccessMobUsage($usage, $oid)) {
                         return true;
                     }
+
+                    if ($oid === null) {
+                        $this->logger->error(
+                            sprintf(
+                                "Could not determine parent obj_id for usage: %s",
+                                json_encode($usage, JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT)
+                            )
+                        );
+                    }
                     break;
             }
         }

diff --git a/Services/Search/classes/class.ilSearchAutoComplete.php b/Services/Search/classes/class.ilSearchAutoComplete.php
@@ -114,7 +114,7 @@ public static function getList(string $a_str): string
                 $rec["keyword"] = '"' . $rec["keyword"] . '"';
             }
             if (!in_array($rec["keyword"], $list) && !in_array($rec["rbac_id"], $checked)) {
-                if (ilSearchAutoComplete::checkObjectPermission($rec["rbac_id"])) {
+                if (ilSearchAutoComplete::checkObjectPermission((int) $rec["rbac_id"])) {
                     $list[] = $lim . $rec["keyword"];
                     $cnt++;
                 }