[Rt-commit] r17924 - in rt/3.999/branches/merge_to_3.8.2: .

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Mon Jan 26 06:49:28 2009
New Revision: 17924

Modified:
   rt/3.999/branches/merge_to_3.8.2/   (props changed)
   rt/3.999/branches/merge_to_3.8.2/lib/RT/Interface/Email.pm

Log:
 r19053 at sunnavys-mb:  sunnavy | 2009-01-26 18:54:52 +0800
 merged 


Modified: rt/3.999/branches/merge_to_3.8.2/lib/RT/Interface/Email.pm
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/lib/RT/Interface/Email.pm	(original)
+++ rt/3.999/branches/merge_to_3.8.2/lib/RT/Interface/Email.pm	Mon Jan 26 06:49:28 2009
@@ -55,6 +55,8 @@
 use RT::EmailParser;
 use File::Temp;
 use UNIVERSAL::require;
+use Mail::Mailer ();
+
 
 BEGIN {
     use base 'Exporter';
@@ -364,6 +366,9 @@
     }
 
     my $mail_command = RT->config->get('MailCommand');
+    if ( $mail_command eq 'testfile' ) {
+        $Mail::Mailer::testfile::config{outfile} = File::Temp->new;
+    }
 
     # if it is a sub routine, we just return it;
     return $mail_command->( $args{'entity'} )
@@ -895,7 +900,8 @@
 
     # Some broken mailers send:  ""Vincent, Jesse"" <jesse at fsck.com>. Hate
     $Addr =~ s/\"\"(.*?)\"\"/\"$1\"/g;
-    my @Addresses = Email::Address->parse($Addr);
+    my @Addresses = RT::EmailParser->parse_email($Addr);
+    
 
     my ($AddrObj) = grep ref $_, @Addresses;
     unless ($AddrObj) {
@@ -1086,11 +1092,12 @@
     my @mail_plugins = @_;
 
     my @res;
-    foreach (@mail_plugins) {
-        if ( ref($_) eq "CODE" ) {
-            push @res, $_;
-        } elsif ( !ref $_ ) {
-            my $Class = $_;
+    foreach my $plugin (@mail_plugins) {
+        if ( ref($plugin) eq "CODE" ) {
+            push @res, $plugin;
+         }
+        elsif ( !ref $plugin ) {
+            my $Class = $plugin;
             $Class = "RT::Interface::Email::" . $Class
                 unless $Class =~ /^RT::Interface::Email::/;
             $Class->require
@@ -1103,7 +1110,7 @@
             }
             push @res, $Class;
         } else {
-            Jifty->log->fatal("$_ - is not class name or code reference");
+            Jifty->log->fatal("$plugin - is not class name or code reference");
         }
     }
     return @res;