You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2004/01/09 00:50:40 UTC
svn commit: rev 6124 - incubator/spamassassin/branches/b2_6_0/lib/Mail
Author: felicity
Date: Thu Jan 8 15:50:40 2004
New Revision: 6124
Modified:
incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm
Log:
bug 2851: "spamassassin -r" (aka M::SA::report_as_spam()) wouldn't
remove SA markup for learning like it did for reporting. add in
a remove_spamassassin_markup() call before anything else in
report_as_spam().
Modified: incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm
==============================================================================
--- incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm (original)
+++ incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm Thu Jan 8 15:50:40 2004
@@ -633,6 +633,10 @@
$self->init(1);
+ # Let's make sure the markup was removed first ...
+ my @msg = split (/^/m, $self->remove_spamassassin_markup($mail));
+ $mail = Mail::SpamAssassin::NoMailAudit->new ('data' => \@msg);
+
$mail = $self->encapsulate_mail_object ($mail);
# learn as spam if enabled
@@ -674,6 +678,10 @@
local ($_);
$self->init(1);
+
+ # Let's make sure the markup was removed first ...
+ my @msg = split (/^/m, $self->remove_spamassassin_markup($mail));
+ $mail = Mail::SpamAssassin::NoMailAudit->new ('data' => \@msg);
$mail = $self->encapsulate_mail_object ($mail);