svn commit: r158867 - in spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm PerMsgLearner.pm

[do...@apache.org]

Author: dos
Date: Wed Mar 23 19:06:04 2005
New Revision: 158867

URL: http://svn.apache.org/viewcvs?view=rev&rev=158867
Log:
bug 4096: reverted r158011

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?view=diff&r1=158866&r2=158867
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed Mar 23 19:06:04 2005
@@ -1338,19 +1338,6 @@
     type => $CONF_TYPE_BOOL
   });
 
-=item learn_with_whitelist		(Default: 0)
-
-If this option is set the AWL database will also be affected when a message
-is learned by the bayes database, due to an autolearn or a call to sa-learn.
-
-=cut
-
-  push (@cmds, {
-    setting => 'learn_with_whitelist',
-    default => 0,
-    type => $CONF_TYPE_BOOL
-  });
-
 =item bayes_sql_override_username
 
 Used by BayesStore::SQL storage implementation.

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm?view=diff&r1=158866&r2=158867
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm Wed Mar 23 19:06:04 2005
@@ -99,7 +99,7 @@
 sub learn_spam {
   my ($self, $id) = @_;
 
-  if ($self->{conf}->{learn_with_whitelist}) {
+  if ($self->{main}->{learn_with_whitelist}) {
     $self->{main}->add_all_addresses_to_blacklist ($self->{msg});
   }
 
@@ -125,7 +125,7 @@
 sub learn_ham {
   my ($self, $id) = @_;
 
-  if ($self->{conf}->{learn_with_whitelist}) {
+  if ($self->{main}->{learn_with_whitelist}) {
     $self->{main}->add_all_addresses_to_whitelist ($self->{msg});
   }
 
@@ -148,7 +148,7 @@
 sub forget {
   my ($self, $id) = @_;
 
-  if ($self->{conf}->{learn_with_whitelist}) {
+  if ($self->{main}->{learn_with_whitelist}) {
     $self->{main}->remove_all_addresses_from_whitelist ($self->{msg});
   }