X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Ffield%2Fsrc%2FPlugin%2Fmigrate%2Fprocess%2Fd7%2FFieldInstanceDefaults.php;h=b9d9bc07d95bfb29eed94df40a64c8fa3f135748;hp=2a463811be8c6833458ea21846879c1eebfb0177;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hpb=aea91e65e895364e460983b890e295aa5d5540a5

diff --git a/web/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php b/web/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php
index 2a463811b..b9d9bc07d 100644
--- a/web/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php
+++ b/web/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php
@@ -19,6 +19,14 @@ class FieldInstanceDefaults extends ProcessPluginBase {
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     list($default_value, $widget_settings) = $value;
     $widget_type = $widget_settings['type'];
+    $default_value = $default_value ?: [];
+
+    // In Drupal 7, the default value for email fields is stored in the key
+    // 'email' while in Drupal 8 it is stored in the key 'value'.
+    if ($widget_type == 'email_textfield' && $default_value) {
+      $default_value[0]['value'] = $default_value[0]['email'];
+      unset($default_value[0]['email']);
+    }
 
     $default = [];