X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=blobdiff_plain;f=Debbugs%2FCGI%2FBugreport.pm;h=de7be81935ff1b188bc03082bbd495b362bd5cc2;hp=7dc2e5f5751ae45624a2dffb7179df8429076a19;hb=50372083ae0dac8ae45be227d335dae55749e847;hpb=4b0c01944b9a3cc024973b94cca89b68e3d0d717

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index 7dc2e5f..de7be81 100644
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -436,6 +436,7 @@ sub handle_record{
 	  elsif (defined $msg_id) {
 	       $$seen_msg_ids{$msg_id} = 1;
 	  }
+	  return () if defined $param{spam} and $param{spam}->is_spam($msg_id);
 	  $output .= qq(<hr><p class="msgreceived"><a name="$msg_number"></a>\n);
 	  $output .= 'View this message in <a href="' . html_escape(bug_links(bug=>$bug_number, links_only => 1, options=>{msg=>$msg_number, mbox=>'yes'})) . '">rfc822 format</a></p>';
 	  $output .= handle_email_message($record,
@@ -455,6 +456,7 @@ sub handle_record{
 	  elsif (defined $msg_id) {
 	       $$seen_msg_ids{$msg_id} = 1;
 	  }
+	  return () if defined $param{spam} and $param{spam}->is_spam($msg_id);
 	  # Incomming Mail Message
 	  my ($received,$hostname) = record_regex($record,qr/Received: \(at (\S+)\) by (\S+)\;/o);
 	  $output .= qq|<hr><p class="msgreceived"><a name="$msg_number"></a><a name="msg$msg_number"></a><a href="#$msg_number">Message #$msg_number</a> received at |.