[Jifty-commit] r649 -

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Fri Mar 3 19:03:07 EST 2006


Author: jesse
Date: Fri Mar  3 19:03:07 2006
New Revision: 649

Modified:
   /   (props changed)
   jifty/trunk/lib/Jifty/Web/PageRegion.pm

Log:
 r25147 at truegrounds:  jesse | 2006-03-03 11:27:14 -0800
 * The way we were setting up out_methods for PageRegions was bogus


Modified: jifty/trunk/lib/Jifty/Web/PageRegion.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/PageRegion.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/PageRegion.pm	Fri Mar  3 19:03:07 2006
@@ -279,15 +279,23 @@
     # have Mason to tack its response onto a variable and not send
     # headers when it does so
     # XXX TODO: this internals diving is icky
-    local Jifty->handler->mason->interp->{'out_method'} = \$result;
+   
+    my $region_content = '';
+    Jifty->handler->mason->interp->out_method( \$region_content);
+    
+    
 
     # Call into the dispatcher
-     Jifty->dispatcher->handle_request;
+    eval { Jifty->dispatcher->handle_request};
 
+     $result .= $region_content;
     if ($self->region_wrapper) {
         $result .= qq|</div>|;
     }
 
+    #XXX TODO: There's gotta be a better way to localize it
+    Jifty->handler->mason->interp->out_method( \&Jifty::MasonHandler::out_method);
+
     return $result;
 }
 


More information about the Jifty-commit mailing list