[Rt-commit] r6535 - in rt/branches/3.7-EXPERIMENTAL: .

[ruz at bestpractical.com]

Author: ruz
Date: Sun Nov 26 17:48:30 2006
New Revision: 6535

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Record.pm

Log:
 r4192 at cubic-pc:  cubic | 2006-11-27 01:53:17 +0300
  r4175 at cubic-pc:  cubic | 2006-11-27 01:21:47 +0300
  * revert things, there is something still wrong in encode
 


Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Record.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Record.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Record.pm	Sun Nov 26 17:48:30 2006
@@ -649,11 +649,13 @@
         $RT::Logger->error("__Value called with undef field");
     }
 
+    my $value = $self->SUPER::__Value( $field );
     if( $args{'decode_utf8'} ) {
-        return Encode::decode_utf8( $self->SUPER::__Value( $field ) );
+        return Encode::decode_utf8( $value ) unless Encode::is_utf8( $value );
     } else {
-        return Encode::encode_utf8( $self->SUPER::__Value( $field ) );
+        return Encode::encode_utf8( $value ) if Encode::is_utf8( $value );
     }
+    return $value;
 }
 
 # Set up defaults for DBIx::SearchBuilder::Record::Cachable