? cr.patch
Index: commentreference.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/commentreference/commentreference.module,v
retrieving revision 1.1.4.7
diff -u -p -r1.1.4.7 commentreference.module
--- commentreference.module	15 Apr 2009 21:53:44 -0000	1.1.4.7
+++ commentreference.module	10 Jun 2009 17:28:55 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: commentreference.module,v 1.1.4.7 2009/04/15 21:53:44 swentel Exp $
+// $Id: commentreference.module,v 1.1.4.4 2008/09/04 23:41:54 swentel Exp $
 
 /**
  * @file
@@ -315,7 +315,7 @@ function commentreference_widget(&$form,
       );
       break;
     case 'commentreference_autocomplete':
-      $comments_from_node = ($field['comments_from_node'] == '1') ? 'node' : 'all';
+      $comments_from_node = $field['comments_from_node'] == '1' ? 'node' : 'all';
       $comments_limit = (isset($field['comments_limit'])) ? $field['comments_limit'] : '0';
       $comments_order = (isset($field['comments_order'])) ? $field['comments_order'] : '0';
       $comments_status = (isset($field['comments_status'])) ? $field['comments_status'] : '0';
@@ -393,10 +393,22 @@ function commentreference_autocomplete_p
   // path and some extra processing to it.
   // Add a validation step where the value can be unwrapped.
   $field_key  = $element['#columns'][0];
+
+  // Special checking for default value on creation of field.
+  $comments_from_node = $element['comments_from_node'] == '1' ? 'node' : 'all';
+  $comments_limit = (isset($element['#comments_limit'])) ? $element['#comments_limit'] : '0';
+  $comments_order = (isset($element['#comments_order'])) ? $element['#comments_order'] : '0';
+  $comments_status = (isset($element['#comments_status'])) ? $element['#comments_status'] : '0';
+  if (empty($comments_limit)) $comments_limit = '0';
+  if (empty($comments_order)) $comments_order = '0';
+  if (empty($comments_status)) $comments_status = '0';
+  $node_id = arg(1);
+  if (!is_numeric($node_id)) $node_id = '0';
+
   $element[$field_key] = array(
     '#type' => 'text_textfield',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
-    '#autocomplete_path' => 'commentreference/autocomplete/'. $element['#comments_from_node'] .'/'. arg(1) .'/'. $element['#comments_limit'] .'/'. $element['#comments_order'] .'/'. $element['#comments_status'] .'/'. $element['#field_name'],
+    '#autocomplete_path' => 'commentreference/autocomplete/'. $element['#comments_from_node'] .'/'. $node_id .'/'. $comments_limit .'/'. $comments_order .'/'. $comments_status .'/'. $element['#field_name'],
     '#element_validate' => array('commentreference_autocomplete_validate'),
 
     // The following values were set by the content module and need