You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2018/10/03 07:29:19 UTC

svn commit: r1842682 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm

Author: hege
Date: Wed Oct  3 07:29:19 2018
New Revision: 1842682

URL: http://svn.apache.org/viewvc?rev=1842682&view=rev
Log:
Fix some callback cases

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm?rev=1842682&r1=1842681&r2=1842682&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm Wed Oct  3 07:29:19 2018
@@ -578,10 +578,14 @@ sub check_razor2_range {
   return unless $self->{razor2_available};
   return unless $self->{main}->{conf}->{use_razor2};
 
+  # Check if callback overriding rulename
+  if (!defined $rulename) {
+    $rulename = $pms->get_current_eval_rule_name();
+  }
+
   # If forked, call back later unless results are in
   if ($self->{main}->{conf}->{razor_fork}) {
     if (!defined $pms->{razor2_result}) {
-      my $rulename = $pms->get_current_eval_rule_name();
       dbg("razor2: delaying check_razor2_range call for $rulename");
       # array matches check_razor2_range() argument order
       push @{$pms->{razor2_range_callbacks}},