? references_migrate-1032808-4.patch
? references_migration-2.patch
? references_migration.patch
Index: node_reference/node_reference.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/references/node_reference/node_reference.module,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 node_reference.module
--- node_reference/node_reference.module	24 Jan 2011 14:41:44 -0000	1.1.2.2
+++ node_reference/node_reference.module	1 Feb 2011 22:16:06 -0000
@@ -801,16 +801,28 @@ function node_reference_content_migrate_
  * style to the D7 style for specific situations not handled by basic
  * conversion, as when formatter or widget names or settings are changed.
  */
-function node_reference_content_migrate_instance_alter(&$instance_value) {
-  // The module name for the instance was corrected
-  // by the change in node_reference_content_migrate_field_alter().
-  switch ($instance_value['module']) {
-    case 'node_reference':
-      // The formatter names changed, all are prefixed
-      // with 'node_reference_'.
-      foreach ($instance_value['display'] as $context => $settings) {
-        $instance_value['display'][$context]['type'] = 'node_reference_' . $settings['type'];
+function node_reference_content_migrate_instance_alter(&$instance_value, $field_value) {
+  switch ($field_value['type']) {
+    case 'nodereference':
+      // Massage formatters.
+      foreach ($instance_value['display'] as $context => &$display) {
+        switch ($display['type']) {
+          case 'full':
+          case 'teaser':
+            // Those two formatters have been merged into
+            // 'node_reference_view_mode', with a formatter setting.
+            $dislplay['type'] = 'node_reference_node';
+            $dislplay['settings']['node_reference_view_mode'] = $display['type'];
+            break;
+
+          default:
+            // The formatter names changed, all are prefixed with
+            // 'node_reference_'.
+            $dislplay['type'] = 'node_reference_' . $display['type'];
+            break;
+        }
       }
+      // Massage the widget.
       switch ($instance_value['widget']['type']) {
         case 'nodereference_autocomplete':
           $instance_value['widget']['type'] = 'node_reference_autocomplete';
Index: user_reference/user_reference.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/references/user_reference/user_reference.module,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 user_reference.module
--- user_reference/user_reference.module	31 Jan 2011 18:28:56 -0000	1.1.2.3
+++ user_reference/user_reference.module	1 Feb 2011 22:16:06 -0000
@@ -637,11 +637,11 @@ function user_reference_content_migrate_
  * situations not handled by basic conversion, as when
  * formatter or widget names or settings are changed.
  */
-function user_reference_content_migrate_instance_alter(&$instance_value) {
+function user_reference_content_migrate_instance_alter(&$instance_value, $field_value) {
   // The module name for the instance was corrected
   // by the change in user_reference_content_migrate_field_alter().
-  switch ($instance_value['module']) {
-    case 'user_reference':
+  switch ($field_value['type']) {
+    case 'userreference':
       // The formatter names changed, all are prefixed
       // with 'user_reference_'.
       foreach ($instance_value['display'] as $context => $settings) {