[Rt-commit] rt branch, 4.0/set-mime-encoding-fix, updated. rt-4.0.1rc1-10-g8af4d66

[? sunnavy]

The branch, 4.0/set-mime-encoding-fix has been updated
       via  8af4d6649e1d9ee8b544a2741618a0fa2bc7dae9 (commit)
      from  d1730ac6d33f3ba39c09e2f3a6134eda4ec0e37b (commit)

Summary of changes:
 lib/RT/I18N.pm |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 8af4d6649e1d9ee8b544a2741618a0fa2bc7dae9
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Jun 9 05:29:24 2011 +0800

    error msg fix

diff --git a/lib/RT/I18N.pm b/lib/RT/I18N.pm
index 9887123..4e52498 100644
--- a/lib/RT/I18N.pm
+++ b/lib/RT/I18N.pm
@@ -264,12 +264,13 @@ sub SetMIMEEntityToEncoding {
             };
 
             if ($@) {
-                $RT::Logger->error( "Encoding error: "
-                      . $@
-                      . " falling back to iso-8859-1 => $enc" );
                 $string = $orig_string;
 
                 my $guess = _GuessCharset( $string );
+
+                $RT::Logger->error( "Encoding error: "
+                      . $@
+                      . " falling back to $guess => $enc" );
                 my $success;
 
                 if ( $guess eq $enc ) {

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