[SACVS] CVS: spamassassin/lib/Mail SpamAssassin.pm,1.206,1.207

Update of /cvsroot/spamassassin/spamassassin/lib/Mail
In directory sc8-pr-cvs1:/tmp/cvs-serv3327/lib/Mail

Modified Files:
        SpamAssassin.pm 
Log Message:
bug 1396: SA 2.60 chokes on messages without Message-ID


Index: SpamAssassin.pm
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin.pm,v
retrieving revision 1.206
retrieving revision 1.207
diff -b -w -u -d -r1.206 -r1.207
--- SpamAssassin.pm     19 Sep 2003 01:51:27 -0000      1.206
+++ SpamAssassin.pm     19 Sep 2003 04:02:40 -0000      1.207
@@ -425,16 +425,16 @@
   require Mail::SpamAssassin::PerMsgLearner;
   $self->init(1);
   my $mail = $self->encapsulate_mail_object ($mail_obj);
-  my $msg = Mail::SpamAssassin::PerMsgLearner->new($self, $mail, $id);
+  my $msg = Mail::SpamAssassin::PerMsgLearner->new($self, $mail);
 
   if ($forget) {
-    $msg->forget();
+    $msg->forget($id);
   } elsif ($isspam) {
     dbg("Learning Spam");
-    $msg->learn_spam();
+    $msg->learn_spam($id);
   } else {
     dbg("Learning Ham");
-    $msg->learn_ham();
+    $msg->learn_ham($id);
   }
 
   $msg;
@@ -637,7 +637,7 @@
 
   # learn as spam if enabled
   if ( $self->{conf}->{bayes_learn_during_report} ) {
-    $self->learn ($mail, scalar($mail->get_header("Message-Id")), 1, 0);
+    $self->learn ($mail, undef, 1, 0);
   }
 
   require Mail::SpamAssassin::Reporter;
@@ -678,7 +678,7 @@
   $mail = $self->encapsulate_mail_object ($mail);
 
   # learn as nonspam
-  $self->learn ($mail, scalar($mail->get_header("Message-Id")), 0, 0);
+  $self->learn ($mail, undef, 0, 0);
 
   require Mail::SpamAssassin::Reporter;
   $mail = Mail::SpamAssassin::Reporter->new($self, $mail, $options);



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf