[Rt-commit] r3970 - in rt/branches/CHALDEA-EXPERIMENTAL: . lib/RT

[jesse at bestpractical.com]

Author: jesse
Date: Fri Oct 14 19:48:29 2005
New Revision: 3970

Modified:
   rt/branches/CHALDEA-EXPERIMENTAL/   (props changed)
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Attachment_Overlay.pm
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm
Log:
 r17375 at hualien:  jesse | 2005-10-14 15:34:45 -0400
  r17362 at hualien:  jesse | 2005-10-14 15:56:53 -0400
  * Merge fixups
 


Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Attachment_Overlay.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Attachment_Overlay.pm	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Attachment_Overlay.pm	Fri Oct 14 19:48:29 2005
@@ -290,7 +290,7 @@
       return( $self->loc("Unknown ContentEncoding [_1]", $self->ContentEncoding));
   }
 
-  # Encode::_utf8_on($content);
+   Encode::_utf8_on($content);
   if (!$enc || $enc eq '' ||  $enc eq 'utf8' || $enc eq 'utf-8') {
     # If we somehow fail to do the decode, at least push out the raw bits
     eval {return( Encode::decode_utf8($content))} || return ($content);

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm	Fri Oct 14 19:48:29 2005
@@ -2594,7 +2594,7 @@
         }
 
         die "I don't know about $field yet"
-            unless ( exists $FIELDS{$realfield}
+            unless ( exists $FIELD_METADATA{$realfield}
             or $restriction->{CUSTOMFIELD} );
 
         my $type = $FIELD_METADATA{$realfield}->[0];