[Rt-commit] [svn] r1151 - in rt: . branches/rt-3.1/html/Elements branches/rt-3.1/lib/RT/Interface

[autrijus at pallas.eruditorum.org]

Author: autrijus
Date: Sat Jun 26 16:38:48 2004
New Revision: 1151

Modified:
   rt/   (props changed)
   rt/branches/rt-3.1/html/Elements/TicketList
   rt/branches/rt-3.1/lib/RT/Interface/Web.pm
Log:
 ----------------------------------------------------------------------
 r5783 at not:  autrijus | 2004-06-26T20:38:49.152776Z
 
 * backport utf8 fixes for TicketSQL strings from 3.3
 ----------------------------------------------------------------------


Modified: rt/branches/rt-3.1/html/Elements/TicketList
==============================================================================
--- rt/branches/rt-3.1/html/Elements/TicketList	(original)
+++ rt/branches/rt-3.1/html/Elements/TicketList	Sat Jun 26 16:38:48 2004
@@ -545,7 +545,7 @@
             }
         }
         else {
-            $m->out($subcol);
+            $m->out( Encode::decode_utf8($subcol) );
         }
     }
     $m->out('</td>');

Modified: rt/branches/rt-3.1/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Interface/Web.pm	(original)
+++ rt/branches/rt-3.1/lib/RT/Interface/Web.pm	Sat Jun 26 16:38:48 2004
@@ -112,7 +112,8 @@
 
 sub EscapeUTF8  {
         my  $ref = shift;
-        my $val = (Encode::is_utf8($$ref) ? Encode::encode_utf8($$ref) : $$ref);                                                                                                                                
+        my $val = $$ref;
+        use bytes;
         $val =~ s/&/&#38;/g;
         $val =~ s/</&lt;/g; 
         $val =~ s/>/&gt;/g;
@@ -121,6 +122,8 @@
         $val =~ s/"/&#34;/g;
         $val =~ s/'/&#39;/g;
         $$ref = $val;
+        Encode::_utf8_on($$ref);
+
 
 }