Index: field_timestamp.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/flexinode/field_timestamp.inc,v
retrieving revision 1.10
diff -u -r1.10 field_timestamp.inc
--- field_timestamp.inc	10 Nov 2005 09:35:16 -0000	1.10
+++ field_timestamp.inc	23 Apr 2006 22:51:47 -0000
@@ -27,10 +27,11 @@
 
 function flexinode_field_timestamp_format($field, $node, $brief = 0) {
   $fieldname = 'flexinode_'. $field->field_id;
-  return format_date($node->$fieldname);
+  // when called from node_preview, $node->$fieldname == 1 and time values are in _year, _month, etc.
+  // when called from node_view, $node->$fieldname contains a timestamp that can be formatted directly
+  return ($node->$fieldname <> 1) ? format_date($node->$fieldname) : format_date(flexinode_validate_date($node, $fieldname));
 }
 
-
 /**
  * A copy of event_form_date().
  */
@@ -121,6 +122,9 @@
       '#required' => TRUE,
       );
   }
+  // allow field to validate properly - see #54215
+  $form[$prefix]['#type'] = 'value';
+  $form[$prefix]['#value'] = 1;
 
   return $form;
 }
@@ -167,7 +171,7 @@
  */
 function theme_flexinode_timestamp($field_id, $label, $value, $formatted_value) {
   $output = theme('form_element', $label, $formatted_value);
-  $output = '<div class="flexinode-timestamp-'. $field_id .'">eh?'. $output .'</div>';
+  $output = '<div class="flexinode-timestamp-'. $field_id .'">'. $output .'</div>';
   return $output;
 }