[Jifty-commit] r2953 - in jifty/trunk/lib/Jifty: View/Declare

[jifty-commit at lists.jifty.org]

Author: clkao
Date: Tue Mar 13 13:43:47 2007
New Revision: 2953

Modified:
   jifty/trunk/lib/Jifty/View/Declare/Handler.pm
   jifty/trunk/lib/Jifty/Web/PageRegion.pm

Log:
TD fragments and unicode needed some massage.

Modified: jifty/trunk/lib/Jifty/View/Declare/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Declare/Handler.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Declare/Handler.pm	Tue Mar 13 13:43:47 2007
@@ -5,7 +5,7 @@
 
 use base qw/Jifty::Object Class::Accessor/;
 use Template::Declare;
-
+use Encode ();
 
 __PACKAGE__->mk_accessors(qw/root_class/);
 
@@ -54,6 +54,7 @@
             Jifty->handler->apache->send_http_header();
         }
     print STDOUT $content;
+    Encode::_utf8_on($content);
     return undef;
 }
 

Modified: jifty/trunk/lib/Jifty/Web/PageRegion.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/PageRegion.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/PageRegion.pm	Tue Mar 13 13:43:47 2007
@@ -17,6 +17,7 @@
 use base qw/Jifty::Object Class::Accessor::Fast/;
 __PACKAGE__->mk_accessors(qw(name force_path force_arguments default_path default_arguments qualified_name parent region_wrapper));
 use Jifty::JSON;
+use Encode ();
 
 =head2 new PARAMHASH
 
@@ -322,14 +323,18 @@
     my $region_content = '';
 
     # template-declare based regions are printing to stdout
-    open my $output_fh, '>>', $out_method;
+    my $td_out = '';
+    Encode::_utf8_on($td_out);
+    open my $output_fh, '>>:utf8', \$td_out;
     local *STDOUT = $output_fh;
 
+    local $main::DEBUG=1;
     # Call into the dispatcher
     Jifty->handler->dispatcher->handle_request;
 
     Jifty->handler->mason->interp->out_method($orig_out);
 
+    $$out_method .= $td_out if length($td_out);
     return;
 }