[Rt-commit] r6832 - in rt/branches/3.7-EXPERIMENTAL-RTIR-2.2: .

[ruz at bestpractical.com]

Author: ruz
Date: Fri Jan 26 13:14:42 2007
New Revision: 6832

Modified:
   rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/   (props changed)
   rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/lib/RT/Action/SendEmail.pm

Log:
 r4308 at cubic-pc (orig r6669):  ruz | 2006-12-20 21:59:40 +0300
 * don't write an email record txn if there were no recipients


Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/lib/RT/Action/SendEmail.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/lib/RT/Action/SendEmail.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/lib/RT/Action/SendEmail.pm	Fri Jan 26 13:14:42 2007
@@ -100,11 +100,11 @@
 sub Commit {
     my $self = shift;
 
-    my $ret = $self->SendMessage( $self->TemplateObj->MIMEObj );
-    if ( $ret && RT->Config->Get('RecordOutgoingEmail') ) {
+    my ($ret) = $self->SendMessage( $self->TemplateObj->MIMEObj );
+    if ( $ret > 0 && RT->Config->Get('RecordOutgoingEmail') ) {
         $self->RecordOutgoingMailTransaction( $self->TemplateObj->MIMEObj )
     }
-    return ($ret);
+    return (abs $ret);
 }
 
 # }}}
@@ -251,7 +251,7 @@
         || $MIMEObj->head->get('Bcc') )
     {
         $RT::Logger->info( $msgid . " No recipients found. Not sending.\n" );
-        return (1);
+        return (-1);
     }
 
     return(0) unless RT::Interface::Email::SendEmail(