[Rt-commit] rt branch, 4.2/do-not-encode-mime-headers-in-forward-method, repushed

[? sunnavy]

The branch 4.2/do-not-encode-mime-headers-in-forward-method was deleted and repushed:
       was bd70fea27144dd3230446d43eb566b525263e573
       now 9f9f5212d7fa1d8e4f54dc66fccfbf118775c313

1:  bd70fea ! 1:  9f9f521 it's not RT::Ticket::Forward's job to encode headers to mime
    @@ -17,17 +17,20 @@
         
         Fixes: I#29714
     
    -diff --git a/etc/upgrade/4.2.12/content b/etc/upgrade/4.2.12/content
    -new file mode 100644
    ---- /dev/null
    -+++ b/etc/upgrade/4.2.12/content
    +diff --git a/etc/upgrade/4.2.11/content b/etc/upgrade/4.2.11/content
    +--- a/etc/upgrade/4.2.11/content
    ++++ b/etc/upgrade/4.2.11/content
     @@
    -+use strict;
    -+use warnings;
    -+
    + use strict;
    + use warnings;
     +use Encode;
    -+
    -+our @Final = (
    + 
    + our @Initial = (
    +     sub {
    +@@
    +                AND Content IS NULL;
    + EOSQL
    +     },
     +    sub {
     +        my $txns = RT::Transactions->new(RT->SystemUser);
     +        $txns->Limit( FIELD => 'Type', VALUE => 'Forward Transaction' );
    @@ -46,7 +49,7 @@
     +            }
     +        }
     +    },
    -+);
    + );
     
     diff --git a/lib/RT/Ticket.pm b/lib/RT/Ticket.pm
     --- a/lib/RT/Ticket.pm
    @@ -67,3 +70,40 @@
                      Transaction => $args{Transaction},
                      Ticket      => $self,
                  )
    +
    +diff --git a/t/web/ticket_forward.t b/t/web/ticket_forward.t
    +--- a/t/web/ticket_forward.t
    ++++ b/t/web/ticket_forward.t
    +@@
    + print $att_fh "this is an attachment";
    + close $att_fh;
    + my $att_name = ( File::Spec->splitpath($att_file) )[-1];
    ++use Encode;
    + 
    + my ( $baseurl, $m ) = RT::Test->started_ok;
    + ok $m->login, 'logged in as root';
    +@@
    +     like($mail, qr/Subject: \[example.com #\d+\] OVERRIDING SUBJECT/);
    + }
    + 
    ++diag "Forward Transaction with non-ascii subject" if $ENV{TEST_VERBOSE};
    ++{
    ++    $m->follow_link_ok( { text => 'Forward', n => 2 }, 'follow 2nd Forward' );
    ++    my $subject = decode_utf8('test non-ascii äöü');
    ++    $m->submit_form(
    ++        form_name => 'ForwardMessage',
    ++        fields    => {
    ++            Subject => $subject,
    ++            To  => 'rt-to at example.com',
    ++        },
    ++        button => 'ForwardAndReturn'
    ++    );
    ++    my ($mail) = RT::Test->fetch_caught_mails;
    ++    if ( $mail =~ /Subject: (.+)/ ) {
    ++        like( decode_utf8(RT::I18N::DecodeMIMEWordsToUTF8( $1, 'Subject' )), qr/$subject/, 'non-ascii subject' );
    ++    }
    ++    $m->content_contains( $subject, 'non-ascii subject got displayed correctly' );
    ++}
    ++
    + undef $m;
    + done_testing;