Changeset 22895

Timestamp:

11/07/08 10:04:47 (2 months ago)

Author:

tokuhirom

Message:

use flagged utf8 internaly

Location:

lang/perl/Moxy/trunk/lib/Moxy

Files:

• Plugin.pm (modified) (1 diff)
• Plugin/ControlPanel.pm (modified) (1 diff)
• Plugin/ShowHTMLSource.pm (modified) (1 diff)

lang/perl/Moxy/trunk/lib/Moxy/Plugin.pm

@@ -22 +22 @@
     my ($self, $context, $fname, $args) = @_;
 
-    my $tt = Template->new(ABSOLUTE => 1);
+    my $tt = Template->new(
+        ABSOLUTE => 1,
+        ENCODING => 'utf8',
+    );
     $tt->process(
         $self->assets_path($context)->file($fname)->stringify,

lang/perl/Moxy/trunk/lib/Moxy/Plugin/ControlPanel.pm

@@ -31 +31 @@
     my $charset = $args->{response}->charset;
     my $enc = Encode::find_encoding($charset);
-    Encode::from_to($output, 'utf-8', $enc ? $enc->name : 'utf-8');
+    $output = Encode::encode(($enc ? $enc->name : 'utf-8'), $output);
 
     # insert control panel to html response.

lang/perl/Moxy/trunk/lib/Moxy/Plugin/ShowHTMLSource.pm

@@ -12 +12 @@
     $context->log(debug => 'dump html source');
 
+    my $charset = $args->{response}->charset;
+    my $enc = Encode::find_encoding($charset);
     return $self->render_template(
         $context,
         'panel.tt' => {
-            html => $args->{response}->content(),
+            html => decode($enc, $args->{response}->content()),
         }
     );