[FEATURE] fe-data-history-3 Problem when removing a FileReference

Tasks: * add check if oldValue is in fact a reference Resolves: #3
sudhaus7 · Sep 18, 2023 · bbf4dd0 · bbf4dd0
1 parent a3a68a8
commit bbf4dd0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Classes/Traits/HistoryRecord.php b/Classes/Traits/HistoryRecord.php
@@ -20,6 +20,7 @@
 use TYPO3\CMS\Extbase\Persistence\Generic\Exception\TooDirtyException;
 use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
+use function get_class;
 
 /**
  * Class HistoryRecord
@@ -88,7 +89,8 @@ protected function writeModified(DomainObjectInterface $object)
                     $oldRecord[$dbProperty] = ($object->_getCleanProperty($property) ? $object->_getCleanProperty($property)->getUid() : null);
                     $newRecord[$dbProperty] = $value->getUid();
                 } else {
-                    $oldRecord[$dbProperty] = $object->_getCleanProperty($property);
+	                $oldValue = $object->_getCleanProperty($property);
+                    $oldRecord[$dbProperty] = $oldValue instanceof AbstractEntity ? $oldValue->getUid() : (int)$oldValue;
                     $newRecord[$dbProperty] = $value;
                 }
             }
@@ -149,7 +151,7 @@ protected function writeDeleted(DomainObjectInterface $object)
      */
     private function getTableName(DomainObjectInterface $obj): string
     {
-        return $this->dataMapper->getDataMap(\get_class($obj))->getTableName();
+        return $this->dataMapper->getDataMap( get_class($obj))->getTableName();
     }
 
     /**
@@ -159,6 +161,6 @@ private function getTableName(DomainObjectInterface $obj): string
      */
     private function getDbFieldName(string $property, DomainObjectInterface $obj): string
     {
-        return $this->dataMapper->convertPropertyNameToColumnName($property, \get_class($obj));
+        return $this->dataMapper->convertPropertyNameToColumnName($property, get_class($obj));
     }
 }