This commit was generated by cvs2svn to compensate for changes in r3921,

[freeside.git] / rt / lib / RT / Action / Autoreply.pm

diff --git a/rt/lib/RT/Action/Autoreply.pm b/rt/lib/RT/Action/Autoreply.pm
index f58b8f2..81f7bdd 100755 (executable)
--- a/rt/lib/RT/Action/Autoreply.pm
+++ b/rt/lib/RT/Action/Autoreply.pm
@@ -74,18 +74,10 @@ sub SetReturnAddress {
     }
     
     unless ($self->TemplateObj->MIMEObj->head->get('From')) {
-       if ($RT::UseFriendlyFromLine) {
-           my $friendly_name = $self->TicketObj->QueueObj->Description ||
-                   $self->TicketObj->QueueObj->Name;
-           $friendly_name =~ s/"/\\"/g;
-           $self->SetHeader( 'From',
-                       sprintf($RT::FriendlyFromLineFormat, 
-                $self->MIMEEncodeString( $friendly_name, $RT::EmailOutputEncoding ), $replyto),
-           );
-       }
-       else {
-           $self->SetHeader( 'From', $replyto );
-       }
+       my $friendly_name = $self->TicketObj->QueueObj->Description ||
+               $self->TicketObj->QueueObj->Name;
+       $friendly_name =~ s/"/\\"/g;
+       $self->SetHeader('From', "\"$friendly_name\" <$replyto>");
     }
     
     unless ($self->TemplateObj->MIMEObj->head->get('Reply-To')) {