svn commit: r929084 - in /spamassassin/trunk: lib/Mail/SpamAssassin/HTML.pm lib/Mail/SpamAssassin/Plugin/BodyEval.pm rulesrc/sandbox/jm/EmailBL.pm

[mm...@apache.org]

Author: mmartinec
Date: Tue Mar 30 11:20:58 2010
New Revision: 929084

URL: http://svn.apache.org/viewvc?rev=929084&view=rev
Log:
Bug 6392: Test suite fails with perl 5.12.0;
some more cleanups according to Bug 6392 comment 4

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/BodyEval.pm
    spamassassin/trunk/rulesrc/sandbox/jm/EmailBL.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm?rev=929084&r1=929083&r2=929084&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm Tue Mar 30 11:20:58 2010
@@ -191,7 +191,7 @@ sub get_rendered_text {
   my $self = shift;
   my %options = @_;
 
-  return join('', @{ $self->{text} }) unless keys %options;
+  return join('', @{ $self->{text} }) unless %options;
 
   my $mask;
   while (my ($k, $v) = each %options) {

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/BodyEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/BodyEval.pm?rev=929084&r1=929083&r2=929084&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/BodyEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/BodyEval.pm Tue Mar 30 11:20:58 2010
@@ -119,7 +119,7 @@ sub _multipart_alternative_difference {
         }
 
 	# If there are no words, mark if there's at least 1 image ...
-	if (keys %html == 0 && exists $pms->{html}{inside}{img}) {
+	if (!%html && exists $pms->{html}{inside}{img}) {
 	  # Use "\n" as the mark since it can't ever occur normally
 	  $html{"\n"}=1;
 	}

Modified: spamassassin/trunk/rulesrc/sandbox/jm/EmailBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jm/EmailBL.pm?rev=929084&r1=929083&r2=929084&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jm/EmailBL.pm (original)
+++ spamassassin/trunk/rulesrc/sandbox/jm/EmailBL.pm Tue Mar 30 11:20:58 2010
@@ -307,7 +307,7 @@ sub _acl_allow {
 sub _lookup {
     my ($self, $pms, $prs, $emails) = @_;
 
-    return 0 unless defined @$emails;
+    return 0 unless @$emails;
 
     my %digests = map { md5_hex($_) => $_ } @$emails;
     my $dcnt = scalar keys %digests;