svn commit: r348079 - /spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm

[fe...@apache.org]

Author: felicity
Date: Mon Nov 21 20:46:42 2005
New Revision: 348079

URL: http://svn.apache.org/viewcvs?rev=348079&view=rev
Log:
bug 4698: allow 'meta RULE 0' to work

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=348079&r1=348078&r2=348079&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Mon Nov 21 20:46:42 2005
@@ -2546,7 +2546,9 @@
       next if (grep( $metas{$_}, @{ $rule_deps{ $metas[$i] } }));
 
       # Add this meta rule to the eval line
-      $evalstr .= '  if (my $result = '.$meta{$metas[$i]}.') { $self->got_hit (q#'.$metas[$i].'#, "", $result); }'."\n";
+      $evalstr .= '  $result = '.$meta{$metas[$i]}.";\n";
+      $evalstr .= '  if ($result) { $self->got_hit (q#'.$metas[$i].'#, "", $result); }'."\n";
+
       splice @metas, $i--, 1;    # remove this rule from our list
     }
   } while ($#metas != $count && $#metas > -1); # run until we can't go anymore
@@ -2582,6 +2584,7 @@
         # crashes meta tests.
 
         my (\$self) = \@_;
+	my \$result;
 
         $evalstr;
     }