Merge tag '4.0.2' into develop

no message
1up-lab · May 7, 2020 · 9568571 · 9568571
2 parents defe26f + 57adb60
commit 9568571
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Driver.php b/src/Driver.php
@@ -604,9 +604,15 @@ public function copy($blnDoNotRedirect = false)
             $set = $this->set;
 
             foreach ($objTranslations->row() as $k => $v) {
-                if (in_array($k, array_keys($GLOBALS['TL_DCA'][$this->strTable]['fields']))
-                    && $GLOBALS['TL_DCA'][$this->strTable]['fields'][$k]['eval']['translatableFor'] != ''
-                ) {
+                if (array_key_exists($k, $GLOBALS['TL_DCA'][$this->strTable]['fields'])) {
+                    if (!$GLOBALS['TL_DCA'][$this->strTable]['fields'][$k]['eval']['translatableFor']) {
+                        if (isset($GLOBALS['TL_DCA'][$this->strTable]['fields'][$k]['default'])) {
+                            $set[$k] = $GLOBALS['TL_DCA'][$this->strTable]['fields'][$k]['default'];
+                        } else {
+                            unset($set[$k]);
+                        }
+                        continue;
+                    }
                     // Empty unique fields or add a unique identifier in copyAll mode
                     if ($GLOBALS['TL_DCA'][$this->strTable]['fields'][$k]['eval']['unique']) {
                         if (\Input::get('act') == 'copyAll') {