Index: core/email_api.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/email_api.php,v
retrieving revision 1.69
diff -u -r1.69 email_api.php
--- core/email_api.php	5 Mar 2004 01:26:17 -0000	1.69
+++ core/email_api.php	14 Mar 2004 02:04:36 -0000
@@ -220,6 +220,10 @@
 		}
 
 		$t_pref_field = 'email_on_' . $p_notify_type;
+		$t_user_pref_table = config_get( 'mantis_user_pref_table' );
+		if ( ! db_field_exists( $t_pref_field, $t_user_pref_table ) ) {
+			$t_pref_field = false;
+		}
 
 		# @@@ we could optimize by modifiying user_cache() to take an array
 		#  of user ids so we could pull them all in.  We'll see if it's necessary
@@ -241,11 +245,13 @@
 			}
 
 			# Exclude users who have this notification type turned off
+			if ( $t_pref_field ) {
 				$t_notify = user_pref_get_pref( $t_id, $t_pref_field );
 				if ( OFF == $t_notify ) {
 					unset( $t_recipients[$t_id] );
 					continue;
 				}
+			}
 
 			# Finally, let's get their emails, if they've set one
 			$t_email = user_get_email( $t_id );
@@ -359,12 +365,12 @@
 	# --------------------
 	# send notices when a bug is RESOLVED
 	function email_resolved( $p_bug_id ) {
-		email_generic( $p_bug_id, 'status_resolved', 'email_notification_title_for_status_bug_resolved' );
+		email_generic( $p_bug_id, 'resolved', 'email_notification_title_for_status_bug_resolved' );
 	}
 	# --------------------
 	# send notices when a bug is CLOSED
 	function email_close( $p_bug_id ) {
-		email_generic( $p_bug_id, 'status_closed', 'email_notification_title_for_status_bug_closed' );
+		email_generic( $p_bug_id, 'closed', 'email_notification_title_for_status_bug_closed' );
 	}
 	# --------------------
 	# send notices when a bug is REOPENED