Index: flexinode/flexinode.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flexinode/flexinode.module,v
retrieving revision 1.77
diff -F^f -U3 -r1.77 flexinode.module
--- flexinode/flexinode.module	29 Apr 2006 18:44:11 -0000	1.77
+++ flexinode/flexinode.module	19 Aug 2006 21:04:59 -0000
@@ -363,7 +363,6 @@ function flexinode_page_admin($ctype_id 
  * Menu callback; presents a form to edit an existing field in a content type.
  */
 function flexinode_admin_field($field_id = NULL) {
-  global $form_values;
 
   $op = $_POST['op'];
 
@@ -373,9 +372,7 @@ function flexinode_admin_field($field_id
 
   switch ($op) {
     case t('Add field'):
-      // load the field select form up into $form_values. formapi is teh r0x0rZ.
-      flexinode_field_select();
-      $output = flexinode_field_form($form_values['field_type'], $form_values['ctype_id']);
+      $output = flexinode_field_form();
       break;
     case t('Confirm'):
       $field = flexinode_load_field($field_id);
@@ -937,12 +934,12 @@ function flexinode_invoke_all($hook, $a1
  * Generate a form for the editing of a content type field.
  * @param field_id can be either a field_id, or string containing the field type for new fields
  */
-function flexinode_field_form($field_id, $ctype_id = NULL) {
+function flexinode_field_form($field_id = NULL, $ctype_id = NULL) {
   if(is_numeric($field_id)) {
     $field = flexinode_load_field($field_id);
   }
   else {
-    $field->field_type = $field_id;
+    $field->field_type = $_POST['edit']['field_type'];
     $ctype_id = $_POST['edit']['ctype_id'];
   }
 
@@ -1055,7 +1052,6 @@ function flexinode_validate_field($edit)
  * Builds and returns the field select form.
  */
 function flexinode_field_select($ctype_id = NULL) {
-
   $form = $options = array();
   foreach (flexinode_field_types() as $field) {
     $options[$field] = t('add %fieldtype', array('%fieldtype' => flexinode_invoke('name', $field)));