[Catalyst-commits] r6865 - in trunk: . Catalyst-Plugin-Unicode/lib/Catalyst/Plugin

[jrockway at dev.catalyst.perl.org]

Author: jrockway
Date: 2007-09-12 11:36:49 +0100 (Wed, 12 Sep 2007)
New Revision: 6865

Modified:
   trunk/
   trunk/Catalyst-Plugin-Unicode/lib/Catalyst/Plugin/Unicode.pm
Log:
 r28664 at foo:  jon | 2007-09-12 04:40:24 -0500
 encode everything, even XML :)



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 6d2a1d83-d666-409f-9dbf-d3bfcf4e9009:/local_branches/Catalyst-bad-mst/trunk:40156
6d2a1d83-d666-409f-9dbf-d3bfcf4e9009:/local_branches/Catalyst-broken-net/trunk:19004
6d2a1d83-d666-409f-9dbf-d3bfcf4e9009:/local_branches/Catalyst_acl_in_conf/trunk:3134
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst-trunk:28533
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/trunk:7830
dd8ad9ea-0304-0410-a433-df5f223e7bc0:/local/Catalyst/trunk:7023
   + 6d2a1d83-d666-409f-9dbf-d3bfcf4e9009:/local_branches/Catalyst-bad-mst/trunk:40156
6d2a1d83-d666-409f-9dbf-d3bfcf4e9009:/local_branches/Catalyst-broken-net/trunk:19004
6d2a1d83-d666-409f-9dbf-d3bfcf4e9009:/local_branches/Catalyst_acl_in_conf/trunk:3134
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst-trunk:28664
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/trunk:7830
dd8ad9ea-0304-0410-a433-df5f223e7bc0:/local/Catalyst/trunk:7023

Modified: trunk/Catalyst-Plugin-Unicode/lib/Catalyst/Plugin/Unicode.pm
===================================================================
--- trunk/Catalyst-Plugin-Unicode/lib/Catalyst/Plugin/Unicode.pm	2007-09-12 10:36:33 UTC (rev 6864)
+++ trunk/Catalyst-Plugin-Unicode/lib/Catalyst/Plugin/Unicode.pm	2007-09-12 10:36:49 UTC (rev 6865)
@@ -2,22 +2,16 @@
 
 use strict;
 
-our $VERSION = '0.5';
+our $VERSION = '0.6';
 
 sub finalize {
     my $c = shift;
-
-    unless ( $c->response->body ) {
-        return $c->NEXT::finalize;
+    
+    if ( $c->response->{body} && utf8::is_utf8($c->response->{body}) ){
+        utf8::encode( $c->response->{body} );
     }
-
-    unless ( $c->response->content_type =~ /^text/ ) {
-        return $c->NEXT::finalize;
-    }
     
-    utf8::encode( $c->response->{body} );
-    
-    $c->NEXT::finalize;
+    return $c->NEXT::finalize;
 }
 
 sub prepare_parameters {