[Rt-commit] r7720 - in rt/branches/3.7-EXPERIMENTAL: . lib/RT/Interface

[ruz at bestpractical.com]

Author: ruz
Date: Sat Apr 28 20:00:05 2007
New Revision: 7720

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

Log:
 r5182 at cubic-pc:  cubic | 2007-04-29 03:57:39 +0400
 * do crypto only if ti's enabled


Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Action/SendEmail.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Action/SendEmail.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Action/SendEmail.pm	Sat Apr 28 20:00:05 2007
@@ -105,7 +105,7 @@
     my $message = $self->TemplateObj->MIMEObj;
 
     my $orig_message;
-    if ( RT->Config->Get('RecordOutgoingEmail') ) {
+    if ( RT->Config->Get('RecordOutgoingEmail') && RT->Config->Get('GnuPG')->{'Enable'} ) {
         # it's hacky, but we should know if we're going to crypt things
         my $attachment = $self->TransactionObj->Attachments->First;
 

Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Email.pm	Sat Apr 28 20:00:05 2007
@@ -349,7 +349,7 @@
         $args{'Ticket'} = $args{'Transaction'}->Object;
     }
 
-    if ( $args{'Ticket'} && $args{'Transaction'} ) {
+    if ( $args{'Ticket'} && $args{'Transaction'} && RT->Config->Get('GnuPG')->{'Enable'} ) {
         my $attachment = $args{'Transaction'}->Attachments->First;
 
         my %crypt;