--- event.module.orig	2008-04-15 20:55:44.000000000 +0000
+++ event.module	2008-04-23 12:39:32.000000000 +0000
@@ -962,10 +962,17 @@ function event_calendar_data($date, $vie
         $node->event = $event;
         $node->event['start_exploded'] = event_explode_date($node->event['start']);
         $node->event['end_exploded'] = event_explode_date($node->event['end']);
-        $node->event['start_format'] = event_format_date($node->event['start_exploded'], 'small');
-        $node->event['start_time_format'] = event_format_date($node->event['start_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
-        $node->event['end_format'] = event_format_date($node->event['end_exploded'], 'small');
-        $node->event['end_time_format'] = event_format_date($node->event['end_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
+        $start_format = event_format_date($node->event['start_exploded'], 'small');
+        $start_time_format = event_format_date($node->event['start_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
+        $end_format = event_format_date($node->event['end_exploded'], 'small');
+        $end_time_format = event_format_date($node->event['end_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
+        _event_format_allday_date((($node->event['has_time'] == 1)? 0:1), $start_format, 
+                                    $end_format, $start_time_format, $end_time_format, 
+                                    $node->event['start'], $node->event['end']);
+        $node->event['start_format'] = $start_format;
+        $node->event['start_time_format'] = $start_time_format;
+        $node->event['end_format'] = $end_format;
+        $node->event['end_time_format'] = $end_time_format;
       }
 
       // this array contains the loaded nodes, so we
@@ -2224,10 +2231,19 @@ function event_nodeapi(&$node, $op, $tea
 
         $node->event['start_exploded'] = event_explode_date($node->event['start']);
         $node->event['end_exploded'] = event_explode_date($node->event['end']);
-        $node->event['start_format'] = event_format_date($node->event['start_exploded'], 'small');
-        $node->event['start_time_format'] = event_format_date($node->event['start_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
-        $node->event['end_format'] = event_format_date($node->event['end_exploded'], 'small');
-        $node->event['end_time_format'] = event_format_date($node->event['end_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
+        $start_format = event_format_date($node->event['start_exploded'], 'small');
+        $start_time_format = event_format_date($node->event['start_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
+        $end_format = event_format_date($node->event['end_exploded'], 'small');
+        $end_time_format = event_format_date($node->event['end_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
+        
+        _event_format_allday_date((($node->event['has_time'] == 1)? 0:1), $start_format, 
+                                    $end_format, $start_time_format, $end_time_format, 
+                                    $node->event['start'], $node->event['end']);
+
+        $node->event['start_format'] = $start_format;
+        $node->event['start_time_format'] = $start_time_format;
+        $node->event['end_format'] = $end_format;
+        $node->event['end_time_format'] = $end_time_format;
         $node->content['event'] = array(
           '#value' => theme('event_nodeapi', $node),
           '#weight' => -10,
@@ -3172,3 +3188,21 @@ function event_token_values($type, $obje
   }
 }
 
+function _event_get_date_format(){
+  $format = variable_get('date_format_short', 'm/d/Y');
+  $formatargs = split(" - ", $format);
+  if($formatargs !== FALSE){
+    $format = $formatargs[0];
+  }else {
+    $format = 'm/d/Y';
+  }
+  return $format;
+}
+function _event_format_allday_date($allday = 0, &$start_format, &$end_format, &$start_time_format, &$end_time_format, $start, $end) {
+  if($allday == 1) {
+    $start_format = event_format_date($start, 'custom', _event_get_date_format());
+    $start_time_format = event_format_date($start, 'custom', _event_get_date_format());
+    $end_format = event_format_date($end, 'custom', _event_get_date_format());
+    $end_time_format = event_format_date($end, 'custom', _event_get_date_format());
+  }
+}