Index: fullcalendar.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/fullcalendar/fullcalendar.module,v
retrieving revision 1.10.2.13
diff -u -p -r1.10.2.13 fullcalendar.module
--- fullcalendar.module	10 Feb 2011 14:00:21 -0000	1.10.2.13
+++ fullcalendar.module	10 Feb 2011 22:29:08 -0000
@@ -244,9 +244,9 @@ function fullcalendar_get_settings($opti
  */
 function template_preprocess_views_view_node_fullcalendar(&$vars) {
   // Check if we have field data.
-  if (!isset($vars['row']->_field_data)) {
-     return;
-   }
+  if (empty($vars['row'])) {
+    return;
+  }
 
   foreach ($vars['view']->field as $id => $field) {
     $fields[$id] = $vars['view']->style_plugin->get_field($vars['view']->row_index, $id);
@@ -254,12 +254,23 @@ function template_preprocess_views_view_
       $date_fields[$id] = $field->fullcalendar_render($vars['row']);
     }
   }
-  $entity = $vars['row']->_field_data[$vars['view']->base_field]['entity'];
 
   $vars['data'] = array(); // Contains the start, end & allDay values.
 
-  $entity_type = $vars['row']->_field_data[$vars['view']->base_field]['entity_type'];
-  $entity->eid = $vars['row']->{$vars['view']->base_field};
+  $eid = $vars['row']->{$vars['view']->base_field};
+  if (isset($vars['row']->_field_data)) {
+    $entity = $vars['row']->_field_data[$vars['view']->base_field]['entity'];
+    $entity_type = $vars['row']->_field_data[$vars['view']->base_field]['entity_type'];
+  }
+  else {
+    foreach (entity_get_info() as $entity_type => $entity_info) {
+      if ($entity_info['base table'] == $vars['view']->base_table) {
+        break;
+      }
+    }
+    $entity = reset(entity_load($entity_type, array($eid)));
+  }
+  $entity->eid = $eid;
 
   list(, , $bundle) = entity_extract_ids($entity_type, $entity);
   $entity->bundle = $bundle;
Index: fullcalendar_handler_field_date.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/fullcalendar/Attic/fullcalendar_handler_field_date.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 fullcalendar_handler_field_date.inc
--- fullcalendar_handler_field_date.inc	9 Feb 2011 16:10:06 -0000	1.1.2.1
+++ fullcalendar_handler_field_date.inc	10 Feb 2011 22:29:08 -0000
@@ -18,4 +18,9 @@ class fullcalendar_handler_field_date ex
       'field_name' => $this->field_alias,
     );
   }
+
+  function query() {
+    parent::query();
+    $this->query->add_field($this->view->base_table, $this->view->base_field);
+  }
 }