X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMisc.pm;h=b275c9dfc3020f9ec30b2ab7ce5dcc5eacf2cf79;hb=7b125e587a4d1ee0aca692e23ea7897f671855ae;hp=895681fb0431c5c19480cd954e10ce45e3579652;hpb=0c54b74fc47304e2d6e70b604e15ef3827fa59d4;p=freeside.git

diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
index 895681fb0..b275c9dfc 100644
--- a/FS/FS/Misc.pm
+++ b/FS/FS/Misc.pm
@@ -353,16 +353,12 @@ sub send_email {
     $smtp_opt{'ssl'} = 1 if defined($enc) && $enc eq 'tls';
     $transport = Email::Sender::Transport::SMTP->new( %smtp_opt );
   }
-  
-  local $@; # just in case
-  eval { sendmail($message, { transport => $transport }) };
- 
-  if(ref($@) and $@->isa('Email::Sender::Failure')) {
-    return ($@->code ? $@->code.' ' : '').$@->message
-  }
-  else {
-    return $@;
-  }
+
+  eval { sendmail($message, { transport => $transport }); };
+  ref($@) eq 'Email::Sender::Failure'
+    ? ( $@->code ? $@->code.' ' : '' ). $@->message
+    : $@;
+
 }
 
 =item send_fax OPTION => VALUE ...