[Rt-commit] [svn] r763 - in rt: . branches/rt-3.3/lib/RT branches/rt-3.3/lib/RT/Interface

[autrijus at pallas.eruditorum.org]

Author: autrijus
Date: Wed Apr 28 02:05:14 2004
New Revision: 763

Modified:
   rt/   (props changed)
   rt/branches/rt-3.3/lib/RT/Base.pm
   rt/branches/rt-3.3/lib/RT/Interface/Web.pm
Log:
 ----------------------------------------------------------------------
 r4223 at not:  autrijus | 2004-04-28T06:00:27.794797Z
 
 * correctly put loc_fuzzy in Base.
 * do not double-encode EscapeUTF8 for Mason.  this resolves the weird
   standalong-httpd bug.
 ----------------------------------------------------------------------


Modified: rt/branches/rt-3.3/lib/RT/Base.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Base.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Base.pm	Wed Apr 28 02:05:14 2004
@@ -103,6 +103,18 @@
     }
 }
 
+sub loc_fuzzy {
+    my $self = shift;
+    if (my $user = $self->OriginalUser) {
+        return $user->loc_fuzzy(@_);
+    }
+    else {
+        use Carp;
+        Carp::confess("No currentuser");
+        return ("Critical error:$self has no CurrentUser", $self);
+    }
+}
+
 eval "require RT::Base_Vendor";
 die $@ if ($@ && $@ !~ qr{^Can't locate RT/Base_Vendor.pm});
 eval "require RT::Base_Local";

Modified: rt/branches/rt-3.3/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Interface/Web.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Interface/Web.pm	Wed Apr 28 02:05:14 2004
@@ -123,8 +123,7 @@
 
 sub EscapeUTF8  {
         my  $ref = shift;
-        my $val = $$ref;
-        use bytes;
+        my $val = (Encode::is_utf8($$ref) ? Encode::encode_utf8($$ref) : $$ref);
         $val =~ s/&/&/g;
         $val =~ s/</&lt;/g; 
         $val =~ s/>/&gt;/g;
@@ -133,7 +132,6 @@
         $val =~ s/"/&#34;/g;
         $val =~ s/'/&#39;/g;
         $$ref = $val;
-        Encode::_utf8_on($$ref);
 
 }