[Jifty-commit] r2405 - in jifty/branches/template-declare: . lib/Jifty

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Tue Dec 19 03:06:13 EST 2006


Author: jesse
Date: Tue Dec 19 03:06:12 2006
New Revision: 2405

Modified:
   jifty/branches/template-declare/   (props changed)
   jifty/branches/template-declare/lib/Jifty/Dispatcher.pm
   jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm

Log:
 r46262 at pinglin:  jesse | 2006-12-19 03:05:52 -0500
 * more updates to use the T::D api


Modified: jifty/branches/template-declare/lib/Jifty/Dispatcher.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Dispatcher.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/Dispatcher.pm	Tue Dec 19 03:06:12 2006
@@ -1131,9 +1131,9 @@
     my $template = shift;
 
     eval { 
-        my( $class,$codetemplate) = Jifty->handler->declare_handler->resolve_template($template);
-        if ($class and $codetemplate) {
-            Jifty->handler->declare_handler->show($class => $codetemplate);
+        my( $val) = Jifty->handler->declare_handler->resolve_template($template);
+        if ($val) {
+            Jifty->handler->declare_handler->show($template);
         } else {
             Jifty->handler->mason->handle_comp( $template ); 
         }

Modified: jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm	Tue Dec 19 03:06:12 2006
@@ -25,7 +25,6 @@
 
 sub show {
     my $self = shift;
-    my $package = shift;
     my $code_template = shift;
 
     no warnings qw/redefine utf8/;
@@ -36,7 +35,7 @@
 
     local $Template::Declare::Tags::BUFFER = '';
 
-    my $rv = $package->show($code_template);
+    my $rv = Template::Declare::Tags::show($code_template);
 
     # XXX - Kluge - Before $r->send_http_headers is fixed for real, escape all non-latin1 characters.
     print STDOUT Encode::encode(latin1 => $rv, &Encode::FB_XMLCREF)
@@ -45,6 +44,6 @@
     return undef;
 }
 
-sub resolve_template { return Template::Declare->resolve_template(@_);}
+sub resolve_template { my $pkg =shift;  return Template::Declare->resolve_template(@_);}
 
 1;


More information about the Jifty-commit mailing list