Index: modules/cck/nodereference.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/nodereference.module,v
retrieving revision 1.13
diff -u -r1.13 nodereference.module
--- modules/cck/nodereference.module	5 Mar 2006 21:01:46 -0000	1.13
+++ modules/cck/nodereference.module	17 Mar 2006 13:10:25 -0000
@@ -187,13 +187,13 @@
         if ($field['multiple']) {
 
           foreach($node_field['relation'] as $delta => $value) {
-            $display_value = db_result(db_query("SELECT n.title FROM {node} n WHERE n.nid = %d", $value));
+            $node_title = db_result(db_query("SELECT n.title FROM {node} n WHERE n.nid = %d", $value));
             $form[$field['field_name']]['title'][$delta] = array(
               '#type' => 'textfield',
               '#title' => t($field['widget']['label']),
               '#maxlength' => 128,
               '#autocomplete_path' => 'nodereference/autocomplete/'. $field['field_name'],
-              '#default_value' => $display_value ? $display_value : ''
+              '#default_value' => $node_title ? $node_title : ''
             );
           }
 
@@ -207,15 +207,14 @@
 
         }
         else {
-          $node_field = db_result(db_query("SELECT n.title FROM {node} n WHERE n.nid = %d", $node->$field['field_name']));
-
+          $node_title = db_result(db_query("SELECT n.title FROM {node} n WHERE n.nid = %d", $node_field['relation'][0]));
 
           $form[$field['field_name']]['title'] = array(
             '#type' => 'textfield',
             '#title' => t($field['widget']['label']),
             '#maxlength' => 128,
             '#autocomplete_path' => 'nodereference/autocomplete/'. $field['field_name'],
-            '#default_value' => $node_field ? $node_field : ''
+            '#default_value' => $node_title ? $node_title : ''
           );
         }
       }
@@ -223,7 +222,7 @@
          $form[$field['field_name']]['relation'] = array(
             '#type' => 'select',
             '#title' => t($field['widget']['label']),
-            '#default_value' => $node_field,
+            '#default_value' => $node_field['relation'],
             '#multiple' => $field['multiple'],
             '#options' => _nodereference_potential_references($field),
           );