Index: event.6x-2.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/signup/includes/event.6x-2.inc,v
retrieving revision 1.3
diff -u -r1.3 event.6x-2.inc
--- event.6x-2.inc	9 Jan 2009 03:49:50 -0000	1.3
+++ event.6x-2.inc	28 Jun 2010 12:32:35 -0000
@@ -87,7 +87,32 @@
   elseif (!empty($node->event_start)) {
     $event_date = event_explode_date($node->event_start);
   }
-  return !empty($event_date) ? event_format_date($event_date, variable_get('signup_date_format', 'medium')) : t('[Untimed]');
+  
+  $signup_format = variable_get('signup_date_format', 'medium');
+  if (!(bool)$node->event['has_time'] || !(bool)$node->event_has_time) {
+    switch ($signup_format) {
+	  case 'small':
+	    $format = variable_get('date_format_short', 'm/d/Y - H:i');
+	    break;
+	  case 'large':
+	    $format = variable_get('date_format_long', 'l, F j, Y - H:i');
+	    break;
+	  case 'custom':
+	    $format = variable_get('date_format_medium', 'D, m/d/Y - H:i');
+	    break;
+	  case 'medium':
+	  default:
+	    $format = variable_get('date_format_medium', 'D, m/d/Y - H:i');
+	}
+    $signup_format = 'custom';
+  	$format = event_strip_time($format);
+  }
+
+  if(isset($format)):
+  	return !empty($event_date) ? event_format_date($event_date, $signup_format, $format) : t('[Untimed]');
+  else:
+  	return !empty($event_date) ? event_format_date($event_date, $signup_format) : t('[Untimed]');
+  endif;
 }
 
 /**