--- resource_conflict.module.orig	2011-02-25 04:07:56.000000000 +0200
+++ resource_conflict.module	2011-07-05 19:44:43.000000000 +0200
@@ -35,9 +35,10 @@
           _resource_conflict_disable($type);
         }
       }
-      if (!empty($node->event_start)) {
+      if (!empty($node->event['start_exploded'])) {
+        event_pre_render($node);
         // Get all overlapping events
-        $tmp = _resource_conflict_overlaps_from_event($node->event_start, $node->event_end);
+        $tmp = _resource_conflict_overlaps_from_event($node->event['start_exploded'], $node->event['end_exploded']);
         $overlapping_node_ids = array_unique(array_merge($overlapping_node_ids, $tmp));
       }
 
@@ -91,8 +92,8 @@
         $end   = format_date(date_convert($conflicting_node->{$date_field}[0]['value2'], $type, DATE_UNIX));
       }
       else {
-        $start = format_date($conflicting_node->event_start);
-        $end = format_date($conflicting_node->event_end);
+        $start = format_date(date_convert($conflicting_node->event['start_exploded'],DATE_ARRAY,DATE_UNIX));
+        $end = format_date(date_convert($conflicting_node->event['end_exploded'],DATE_ARRAY,DATE_UNIX));
       }
 
       $error = t('There is a resource conflict: <a href="@resource-url">%resource</a> is currently booked for <a href="@booker-url">%booker</a> from %start to %end. Please choose a different time or a different resource.',
@@ -354,8 +355,8 @@
  *   An array of node ID's
  */
 function _resource_conflict_overlaps_from_event($event_start, $event_end) {
-  $start = date_make_date($event_start, 'GMT', DATE_UNIX);
-  $end = date_make_date($event_end, 'GMT', DATE_UNIX);
+  $start = date_make_date($event_start, NULL, DATE_ARRAY);
+  $end = date_make_date($event_end, NULL, DATE_ARRAY);
   return _resource_conflict_get_overlaps($start, $end);
 }
 
@@ -406,9 +407,9 @@
       }
     }
     elseif ($date_field == 'event') { //event enabled
-      $query = "SELECT DISTINCT nid FROM {event} WHERE (%d >= event_start AND %d < event_end)
-        OR (%d > event_start AND %d <= event_end)
-        OR (%d <= event_start AND %d >= event_end)";
+      $query = "SELECT DISTINCT nid FROM {event} WHERE (%d >= unix_event_start AND %d < unix_event_end)
+        OR (%d > unix_event_start AND %d <= unix_event_end)
+        OR (%d <= unix_event_start AND %d >= unix_event_end)";
       $result = db_query($query, $event_start, $event_start, $event_end, $event_end, $event_start, $event_end);
 
       // Create an array of all of the results