[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.8-218-g7f129b0

[Alex Vandiver]

The branch, 3.8-trunk has been updated
       via  7f129b076f5ff087a55e59ebb9e91c812d8118b9 (commit)
       via  5b9cc9cc62de3434a2034a173529caa44b931b60 (commit)
       via  6f79935cf4954945b4e665de32c2b3c0beba1268 (commit)
       via  6eff0bf322514d17aad350fe6f8feb3a127f1500 (commit)
       via  01fa70cbbec4fc5914b1978c693d459b40266f23 (commit)
       via  8d1edfb9c65950a1e128c763a5cfa4011e1523e5 (commit)
       via  ceae04d45e780051107bd12f012e47281cd65807 (commit)
      from  70cf6c5626629a4756203c6835ea638b1e38f893 (commit)

Summary of changes:
 lib/RT/I18N.pm |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 deletions(-)

- Log -----------------------------------------------------------------
commit 7f129b076f5ff087a55e59ebb9e91c812d8118b9
Merge: 70cf6c5 5b9cc9c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Nov 30 16:25:00 2010 -0500

    Merge branch 'decode_words_rework' into 3.8-trunk
    
    Conflicts:
    	lib/RT/I18N.pm

diff --cc lib/RT/I18N.pm
index 7354239,48dee4c..906bd0c
--- a/lib/RT/I18N.pm
+++ b/lib/RT/I18N.pm
@@@ -357,16 -339,15 +359,16 @@@ sub DecodeMIMEWordsToEncoding 
              ."only Q(uoted-printable) and B(ase64) are supported");
  	}
  
--	# now we have got a decoded subject, try to convert into the encoding
-     unless ( $charset eq $enc ) {
-         my $orig_str = $enc_str;
-         eval { Encode::from_to( $enc_str, $charset, $enc, Encode::FB_CROAK ) };
-         if ($@) {
-             $enc_str = $orig_str;
-             $charset = _GuessCharset($enc_str);
-             Encode::from_to( $enc_str, $charset, $enc );
 -	unless ($charset eq $to_charset) {
 -            local $@;
 -	    eval { Encode::from_to($enc_str, $charset, $to_charset) };
 -	    if ($@) {
 -		$charset = _GuessCharset( $enc_str );
 -		Encode::from_to($enc_str, $charset, $to_charset);
 -	    }
 -	}
++        # now we have got a decoded subject, try to convert into the encoding
++        unless ( $charset eq $to_charset ) {
++            my $orig_str = $enc_str;
++            eval { Encode::from_to( $enc_str, $charset, $to_charset, Encode::FB_CROAK ) };
++            if ($@) {
++                $enc_str = $orig_str;
++                $charset = _GuessCharset( $enc_str );
++                Encode::from_to( $enc_str, $charset, $to_charset );
++            }
 +        }
-     }
  
          # XXX TODO: RT doesn't currently do the right thing with mime-encoded headers
          # We _should_ be preserving them encoded until after parsing is completed and

-----------------------------------------------------------------------