Index: event.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/event/event.module,v
retrieving revision 1.134
diff -u -r1.134 event.module
--- event.module	25 May 2005 21:30:53 -0000	1.134
+++ event.module	28 May 2005 10:10:10 -0000
@@ -1598,7 +1598,7 @@
 
     case 'form post':
       $form = '';
-      if (variable_get('event_nodeapi_'. $node->type, 'never') != 'never') {
+      if ($node->show_as_event != 'never') {
           global $user;
           $form = form_item(t('Start'), event_form_date(($node->event_start ? $node->event_start : _event_user_time()), 'start', $node->start_offset), t('Start date.'));
 
@@ -1617,7 +1617,7 @@
       return $form;
 
     case 'validate':
-      if (variable_get('event_nodeapi_'. $node->type, 'never') != 'never') {
+      if ($node->show_as_event != 'never') {
         event_validate_form_date($node, 'start');
         event_validate_form_date($node, 'end');
         if ($node->event_end < $node->event_start) {
@@ -1642,7 +1642,7 @@
       break;
 
     case 'insert':
-      if (variable_get('event_nodeapi_'. $node->type, 'never') != 'never') {
+      if ($node->show_as_event != 'never') {
         $fields = array('nid', 'event_start', 'event_end');
         db_query('INSERT INTO {event} (nid, event_start, event_end, timezone) VALUES (%d, %d, %d, %d)', $node->nid, $node->event_start, $node->event_end, $node->timezone);
       }
@@ -1650,7 +1650,7 @@
       break;
 
     case 'update':
-      if (variable_get('event_nodeapi_'. $node->type, 'never') != 'never') {
+      if ($node->show_as_event != 'never') {
         $fields = array('event_start', 'event_end');
         db_query('UPDATE {event} SET event_start = %d, event_end = %d, timezone = %d WHERE nid = %d', $node->event_start, $node->event_end, $node->timezone, $node->nid);
       }
@@ -1658,14 +1658,15 @@
       break;
 
     case 'delete':
-      if (variable_get('event_nodeapi_'. $node->type, 'never') != 'never') {
+      if ($node->show_as_event != 'never') {
         db_query('DELETE FROM {event} WHERE nid = %d', $node->nid);
       }
       event_set_range();
       break;
 
     case 'load':
-      if (variable_get('event_nodeapi_'. $node->type, 'never') != 'never') {
+      event_node_is_event($node);
+      if ($node->show_as_event != 'never') {
         $object = db_fetch_object(db_query('SELECT event_start, event_end, timezone FROM {event} WHERE nid = %d', $node->nid));
         switch (variable_get('event_timezone_display', 'event')) {
           case 'event' :
@@ -1697,19 +1698,22 @@
       break;
 
     case 'view':
-      if (variable_get('event_nodeapi_'. $node->type, 'never') != 'never') {
+      if ($node->show_as_event != 'never') {
         $node->body = theme('event_nodeapi', $node). $node->body;
         $node->teaser = theme('event_nodeapi', $node). $node->teaser;
       }
       break;
 
     case 'rss item':
-      if (variable_get('event_nodeapi_'. $node->type, 'never') != 'never') {
+      if ($node->show_as_event != 'never') {
         $node->body = theme('event_nodeapi', $node). $node->body;
         $node->teaser = theme('event_nodeapi', $node). $node->teaser;
       }
       break;
   }
+
+function event_node_is_event(&$node) {
+  $node->show_as_event = isset($node->show_as_event) ? $node->show_as_event : variable_get('event_nodeapi_'.$node->type, 'never');
 }
 
 function event_get_types($state = NULL) {