Made Mojolicious' layouts workable

vti · Oct 9, 2010 · 0835702 · abh · Oct 9, 2010 · mvuets
1 parent 2017749
commit 0835702
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/MojoX/Renderer/TT.pm b/lib/MojoX/Renderer/TT.pm
@@ -73,7 +73,10 @@ sub _render {
     my @params = ({%{$c->stash}, c => $c, h => $helper}, $output, {binmode => ':utf8'});
     $self->tt->{SERVICE}->{CONTEXT}->{LOAD_TEMPLATES}->[0]->ctx($c);
 
+    my $in_layout = $$output ? 0 : 1;
+    $$output = '';
     my $ok = $self->tt->process(defined $inline ? \$inline : $path, @params);
+    $c->stash->{content} = $$output if $in_layout;
 
     # Error
     unless ($ok) {

diff --git a/t/lite_app.t b/t/lite_app.t
@@ -5,7 +5,7 @@ use warnings;
 
 use utf8;
 
-use Test::More tests => 25;
+use Test::More tests => 27;
 
 use Mojolicious::Lite;
 use Mojo::ByteStream 'b';
@@ -24,7 +24,7 @@ get '/with_include' => 'include';
 
 get '/with_wrapper' => 'wrapper';
 
-#get '/with_auto_wrapper' => sub { shift->render(auto_wrapper => layout => 'layout') };
+get '/with_auto_wrapper' => sub { shift->render(auto_wrapper => layout => 'layout') };
 
 get '/unicode' => 'unicode';
 
@@ -53,7 +53,7 @@ $t->get_ok('/with_include')->content_is("HelloInclude!Hallo");
 $t->get_ok('/with_wrapper')->content_is("wrapped");
 
 # With auto wrapper
-#$t->get_ok('/with_auto_wrapper')->content_is("wrapped");
+$t->get_ok('/with_auto_wrapper')->content_is("wrapped");
 
 # Unicode
 $t->get_ok('/unicode')->content_is(b("привет")->encode('UTF-8')->to_string);