Fixed bug #8635: Side-effect of the fix for bug #7897: MM-relations, flexform and...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3777 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 3af6c7e..5916410 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-10  Ernesto Baschny  <ernst@cron-it.de>
+
+       * Fixed bug #8635: Side-effect of the fix for bug #7897: MM-relations, flexform and others got lost during copying/localizing
+
 2008-06-10  Patrick Broens  <patrick@patrickbroens.nl>
 
        * Fixed bug #8422: Context Sensitive Help mode with "display full text messages"

diff --git a/t3lib/class.t3lib_tcemain.php b/t3lib/class.t3lib_tcemain.php
index 1ee21f0..1ed8c38 100755 (executable)
--- a/t3lib/class.t3lib_tcemain.php
+++ b/t3lib/class.t3lib_tcemain.php
@@ -1095,16 +1095,10 @@ class t3lib_TCEmain     {
                                                break;
                                                default:
                                                        if (isset($TCA[$table]['columns'][$field]))     {
-                                                               if ($this->dontProcessTransformations)  {
-                                                                               // In case of a copy, just copy original values over
-                                                                       $fieldArray[$field] = $fieldValue;
-                                                               } else  {
-                                                                               // Evaluating the value
-                                                                       $res = $this->checkValue($table,$field,$fieldValue,$id,$status,$realPid,$tscPID);
-                                                                       if (isset($res['value']))       {
-                                                                               $fieldArray[$field] = $res['value'];
-
-                                                                       }
+                                                                       // Evaluating the value
+                                                               $res = $this->checkValue($table,$field,$fieldValue,$id,$status,$realPid,$tscPID);
+                                                               if (isset($res['value']))       {
+                                                                       $fieldArray[$field] = $res['value'];
                                                                }
 
                                                                        // Add the value of the original record to the diff-storage content:
@@ -2021,7 +2015,7 @@ class t3lib_TCEmain       {
                                case 'date':
                                case 'datetime':
                                        $value = intval($value);
-                                       if ($value>0)   {
+                                       if ($value>0 && !$this->dontProcessTransformations)     {
                                                $value -= date('Z', $value);
                                        }
                                break;