Index: t3lib/class.t3lib_tcemain.php
===================================================================
--- t3lib/class.t3lib_tcemain.php	(Revision 9099)
+++ t3lib/class.t3lib_tcemain.php	(Arbeitskopie)
@@ -1739,11 +1739,11 @@
 					$newFiles = implode(',', $dbAnalysis->getValueArray());
 					list(,,$recFieldName) = explode(':', $recFID);
 					if ($currentFilesForHistory != $newFiles) {
-						$this->mmHistoryRecords[$currentTable . ':' . $id]['oldRecord'][$recFieldName] = $currentFilesForHistory;
-						$this->mmHistoryRecords[$currentTable . ':' . $id]['newRecord'][$recFieldName] = $newFiles;
+						$this->mmHistoryRecords[$table . ':' . $id]['oldRecord'][$recFieldName] = $currentFilesForHistory;
+						$this->mmHistoryRecords[$table . ':' . $id]['newRecord'][$recFieldName] = $newFiles;
 					} else {
-						$this->mmHistoryRecords[$currentTable . ':' . $id]['oldRecord'][$currentField] = '';
-						$this->mmHistoryRecords[$currentTable . ':' . $id]['newRecord'][$currentField] = '';
+						$this->mmHistoryRecords[$table . ':' . $id]['oldRecord'][$currentField] = '';
+						$this->mmHistoryRecords[$table . ':' . $id]['newRecord'][$currentField] = '';
 					}
 				} else {
 					$this->dbAnalysisStore[] = array($dbAnalysis, $tcaFieldConf['MM'], $id, 0);	// This will be traversed later to execute the actions
@@ -4142,7 +4142,7 @@
 					unlink ($dat['ID_absFile']);
 #echo 'DELETE FlexFormFile:'.$dat['ID_absFile'].LF;
 				} else {
-					$this->log($table,0,3,0,100,"Delete: Referenced file '".$dat['ID_absFile']."' that was supposed to be deleted together with it's record didn't exist");
+					$this->log('',0,3,0,100,"Delete: Referenced file '".$dat['ID_absFile']."' that was supposed to be deleted together with it's record didn't exist");
 				}
 			}
 		}
Index: typo3/sysext/version/class.tx_version_tcemain.php
===================================================================
--- typo3/sysext/version/class.tx_version_tcemain.php	(Revision 9099)
+++ typo3/sysext/version/class.tx_version_tcemain.php	(Arbeitskopie)
@@ -1160,7 +1160,7 @@
 			if ($TCA[$table]['ctrl']['cruser_id']) {
 				$newVersion_placeholderFieldArray[$TCA[$table]['ctrl']['cruser_id']] = $tcemainObj->userid;
 			}
-			if ($TCA[$table]['ctrl']['tstamp'] && count($fieldArray)) {
+			if ($TCA[$table]['ctrl']['tstamp']) {
 				$newVersion_placeholderFieldArray[$TCA[$table]['ctrl']['tstamp']] = $GLOBALS['EXEC_TIME'];
 			}