[Rt-commit] r3723 - in rt/branches/3.4-RELEASE: . lib/RT lib/RT/Interface

[jesse at bestpractical.com]

Author: jesse
Date: Thu Aug 25 15:53:40 2005
New Revision: 3723

Modified:
   rt/branches/3.4-RELEASE/   (props changed)
   rt/branches/3.4-RELEASE/lib/RT/EmailParser.pm
   rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm
Log:
 r13759 at hualien:  jesse | 2005-08-25 15:31:56 -0400
 * Fixes to IsRTAddress processing. Spotted by Travis Campbell.
 


Modified: rt/branches/3.4-RELEASE/lib/RT/EmailParser.pm
==============================================================================
--- rt/branches/3.4-RELEASE/lib/RT/EmailParser.pm	(original)
+++ rt/branches/3.4-RELEASE/lib/RT/EmailParser.pm	Thu Aug 25 15:53:40 2005
@@ -320,7 +320,7 @@
         next if ( lc $args{'CurrentUser'}->EmailAddress   eq lc $Address );
         next if ( lc $args{'QueueObj'}->CorrespondAddress eq lc $Address );
         next if ( lc $args{'QueueObj'}->CommentAddress    eq lc $Address );
-        next if ( IsRTAddress($Address) );
+        next if ( $self->IsRTAddress($Address) );
 
         push ( @Addresses, $Address );
     }
@@ -468,7 +468,10 @@
     my @addrlist;
 
     foreach my $addr( @addresses ) {
-      push (@addrlist, $addr)    unless IsRTAddress("", $addr);
+                                 # We use the class instead of the instance
+                                 # because sloppy code calls this method
+                                 # without a $self
+      push (@addrlist, $addr)    unless RT::EmailParser->IsRTAddress($addr);
     }
     return (@addrlist);
 }

Modified: rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm	Thu Aug 25 15:53:40 2005
@@ -344,7 +344,7 @@
  	next if ($args{'CurrentUser'}->EmailAddress =~ /^\Q$Address\E$/i);
 	next if ($args{'QueueObj'}->CorrespondAddress =~ /^\Q$Address\E$/i);
 	next if ($args{'QueueObj'}->CommentAddress =~ /^\Q$Address\E$/i);
-	next if (RT::EmailParser::IsRTAddress(undef, $Address));
+	next if (RT::EmailParser->IsRTAddress($Address));
 	
 	push (@Addresses, $Address);
     }