Merge pull request #46012 from richard67/5.4-dev-upmerge-2025-08-29

[5.4] Upmerge 2025-08-29

Author: muhme

libraries/src/Versioning/VersionableModelTrait.php

@@ -80,8 +80,14 @@ public function loadHistory($versionId, Table $table)
             $table->load($rowArray[$key]);
         }
 
-        $rowArray['checked_out']      = $this->getCurrentUser()->id;
-        $rowArray['checked_out_time'] = (new Date())->toSql();
+        // We set checked_out to the current user
+        if ($table->hasField('checked_out')) {
+            $rowArray[$table->getColumnAlias('checked_out')] = $this->getCurrentUser()->id;
+        }
+
+        if ($table->hasField('checked_out_time')) {
+            $rowArray[$table->getColumnAlias('checked_out_time')] = (new Date())->toSql();
+        }
 
         // Fix null ordering when restoring history
         if (\array_key_exists('ordering', $rowArray) && $rowArray['ordering'] === null) {