secure broken dc ref fields against copy and sort calls (#8600)

ILIAS-eLearning · Dec 3, 2024 · 5af5d52 · 5af5d52
1 parent 1f63785
commit 5af5d52
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Modules/DataCollection/classes/Fields/Reference/class.ilDclReferenceFieldModel.php b/Modules/DataCollection/classes/Fields/Reference/class.ilDclReferenceFieldModel.php
@@ -31,7 +31,11 @@ public function getRecordQuerySortObject(
         global $DIC;
         $ilDB = $DIC['ilDB'];
 
-        if ($this->hasProperty(self::PROP_N_REFERENCE)) {
+        if (
+            $this->hasProperty(self::PROP_N_REFERENCE) ||
+            $this->getProperty(self::PROP_REFERENCE) === null ||
+            ilDclCache::getFieldCache($this->getProperty(self::PROP_REFERENCE))->getTableId() === 0
+        ) {
             return null;
         }
 

diff --git a/Modules/DataCollection/classes/Table/class.ilDclTable.php b/Modules/DataCollection/classes/Table/class.ilDclTable.php
@@ -1060,6 +1060,9 @@ public function cloneStructure(ilDclTable $original): void
             if (!$orig_field->isStandardField()) {
                 $class_name = get_class($orig_field);
                 $new_field = new $class_name();
+                if ($new_field instanceof ilDclReferenceFieldModel && $new_field->getFieldRef()->getTableId() === 0) {
+                    continue;
+                }
                 $new_field->setTableId($this->getId());
                 $new_field->cloneStructure((int) $orig_field->getId());
                 $new_fields[$orig_field->getId()] = $new_field;