Index: volunteer.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/volunteer/volunteer.module,v
retrieving revision 1.11
diff -u -r1.11 volunteer.module
--- volunteer.module	24 May 2005 04:32:43 -0000	1.11
+++ volunteer.module	2 Jul 2005 00:19:03 -0000
@@ -415,35 +415,35 @@
       case 'approve':
         $subject = $subject = t("You've beeen approved for %event_title!", $variables);
         $recipient = $volunteer->mail;
-        $text = $event->message_approve ? $event->message_approve : variable_get('volunteer_message_approve',_volunteer_default_messages('approve'));
+        $text = $event->volunteer['message_approve'] ? $event->volunteer['message_approve'] : variable_get('volunteer_message_approve',_volunteer_default_messages('approve'));
         $message = t($text, $variables);
         $header = 'From: '.t('%coordinator <%coordinator_mail>',$variables)."\nX-Mailer: Drupal\nErrors-to: $coordinator->mail";				
         break;
       case 'deny':
         $subject = $subject = t("%event_title was full. Sorry!", $variables);
         $recipient = $volunteer->mail;
-        $text = $event->message_deny ? $event->message_deny : variable_get('volunteer_message_deny',_volunteer_default_messages('deny'));
+        $text = $event->volunteer['message_deny'] ? $event->volunteer['message_deny'] : variable_get('volunteer_message_deny',_volunteer_default_messages('deny'));
         $message = t($text, $variables);
         $header = 'From: '.t('%coordinator <%coordinator_mail>',$variables)."\nX-Mailer: Drupal\nErrors-to: $coordinator->mail";	
         break;
       case 'wait':
         $subject = $subject = t("You've been placed on the waiting list for %event_title", $variables);
         $recipient = $volunteer->mail;
-        $text = $event->message_wait ? $event->message_wait : variable_get('volunteer_message_wait',_volunteer_default_messages('wait'));
+        $text = $event->volunteer['message_wait'] ? $event->volunteer['message_wait'] : variable_get('volunteer_message_wait',_volunteer_default_messages('wait'));
         $message = t($text, $variables);
         $header = 'From: '.t('%coordinator <%coordinator_mail>',$variables)."\nX-Mailer: Drupal\nErrors-to: $coordinator->mail";	
         break;
       case 'reminder':
         $subject = $subject = t("Reminder about volunteering for %event_title", $variables);
         $recipient = $volunteer->mail;
-        $text = $event->message_reminder ? $event->message_reminder : variable_get('volunteer_message_reminder',_volunteer_default_messages('reminder'));
+        $text = $event->volunteer['message_reminder'] ? $event->volunteer['message_reminder'] : variable_get('volunteer_message_reminder',_volunteer_default_messages('reminder'));
         $message = t($text, $variables);
         $header = 'From: '.t('%coordinator <%coordinator_mail>',$variables)."\nX-Mailer: Drupal\nErrors-to: $coordinator->mail";	
         break;
       case 'follow_up':
         $subject = $subject = t("How was %event_title?", $variables);
         $recipient = $volunteer->mail;
-        $text = $event->message_follow_up ? $event->message_follow_up : variable_get('volunteer_message_follow_up',_volunteer_default_messages('follow_up'));
+        $text = $event->volunteer['message_follow_up'] ? $event->volunteer['message_follow_up'] : variable_get('volunteer_message_follow_up',_volunteer_default_messages('follow_up'));
         $message = t($text, $variables);
         $header = 'From: '.t('%coordinator <%coordinator_mail>',$variables)."\nX-Mailer: Drupal\nErrors-to: $coordinator->mail";	
         break;