Index: modules/nodereference/nodereference.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/modules/nodereference/Attic/nodereference.module,v
retrieving revision 1.138.2.69
diff -u -p -r1.138.2.69 nodereference.module
--- modules/nodereference/nodereference.module	14 Aug 2010 05:17:39 -0000	1.138.2.69
+++ modules/nodereference/nodereference.module	31 Jan 2011 15:07:19 -0000
@@ -238,7 +264,13 @@ function nodereference_field($op, &$node
     case 'sanitize':
       // We can't just check the node is 'referenceable', because Views-mode
       // could rely on 'current user' (at edit time).
-
+      
+      // Override i18n_selection_mode based on field settings.
+      if(module_exists('i18n') && $field['i18n_selection_mode']) {
+        i18n_selection_mode($field['i18n_selection_mode']);
+        $reset_i18n_selection_mode = TRUE;
+      }
+      
       // Extract nids to check.
       $ids = array();
       foreach ($items as $delta => $item) {
@@ -270,6 +302,12 @@ function nodereference_field($op, &$node
           }
         }
       }
+      
+      // Reset i18n_selection_mode
+      if($reset_i18n_selection_mode) {
+        i18n_selection_mode('reset');
+      }
+      
       return $items;
   }
 }